4 files changed, 4 insertions, 33 deletions
diff --git a/resources/libreboot/config/macbook21/config b/resources/libreboot/config/macbook21/config
index 1efe0649..2d98acfd 100644
--- a/resources/libreboot/config/macbook21/config
+++ b/resources/libreboot/config/macbook21/config
@@ -125,9 +125,6 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Apple Inc."
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
-# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
-# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
 CONFIG_POST_IO=y
@@ -294,8 +291,6 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 # CONFIG_VGA_ROM_RUN is not set
 # CONFIG_ON_DEVICE_ROM_RUN is not set
-# CONFIG_PCI_OPTION_ROM_RUN_REALMODE is not set
-# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
@@ -375,7 +370,7 @@ CONFIG_CONSOLE_SERIAL_115200=y
 CONFIG_TTYS0_BAUD=115200
 CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
-# CONFIG_CONSOLE_USB is not set
+CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
@@ -433,8 +428,6 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
 # CONFIG_SEABIOS_VGA_COREBOOT is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
diff --git a/resources/libreboot/config/t60/config b/resources/libreboot/config/t60/config
index 9beea69a..cb4c92dd 100644
--- a/resources/libreboot/config/t60/config
+++ b/resources/libreboot/config/t60/config
@@ -123,9 +123,6 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
-# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
-# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
 CONFIG_POST_IO=y
@@ -141,7 +138,6 @@ CONFIG_BOARD_LENOVO_T60=y
 CONFIG_SEABIOS_PS2_TIMEOUT=3000
 CONFIG_USBDEBUG_HCD_INDEX=0
 CONFIG_CPU_ADDR_BITS=36
-# CONFIG_BOARD_LINUTOP_LINUTOP1 is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_USBDEBUG=y
 CONFIG_MAINBOARD_VERSION="ThinkPad T60"
@@ -308,8 +304,6 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 # CONFIG_VGA_ROM_RUN is not set
 # CONFIG_ON_DEVICE_ROM_RUN is not set
-# CONFIG_PCI_OPTION_ROM_RUN_REALMODE is not set
-# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
@@ -390,7 +384,7 @@ CONFIG_CONSOLE_SERIAL_115200=y
 CONFIG_TTYS0_BAUD=115200
 CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
-# CONFIG_CONSOLE_USB is not set
+CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
@@ -448,8 +442,6 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
 # CONFIG_SEABIOS_VGA_COREBOOT is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
diff --git a/resources/libreboot/config/x60/config b/resources/libreboot/config/x60/config
index 04f08625..9ff95c44 100644
--- a/resources/libreboot/config/x60/config
+++ b/resources/libreboot/config/x60/config
@@ -123,9 +123,6 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
-# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
-# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
 CONFIG_POST_IO=y
@@ -307,8 +304,6 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 # CONFIG_VGA_ROM_RUN is not set
 # CONFIG_ON_DEVICE_ROM_RUN is not set
-# CONFIG_PCI_OPTION_ROM_RUN_REALMODE is not set
-# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
@@ -392,7 +387,7 @@ CONFIG_CONSOLE_SERIAL_115200=y
 CONFIG_TTYS0_BAUD=115200
 CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
-# CONFIG_CONSOLE_USB is not set
+CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
@@ -450,8 +445,6 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
 # CONFIG_SEABIOS_VGA_COREBOOT is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
diff --git a/resources/libreboot/config/x60t/config b/resources/libreboot/config/x60t/config
index e0f2f906..14ad5bea 100644
--- a/resources/libreboot/config/x60t/config
+++ b/resources/libreboot/config/x60t/config
@@ -123,9 +123,6 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
-# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
-# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
 CONFIG_POST_IO=y
@@ -307,8 +304,6 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 # CONFIG_VGA_ROM_RUN is not set
 # CONFIG_ON_DEVICE_ROM_RUN is not set
-# CONFIG_PCI_OPTION_ROM_RUN_REALMODE is not set
-# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
@@ -392,7 +387,7 @@ CONFIG_CONSOLE_SERIAL_115200=y
 CONFIG_TTYS0_BAUD=115200
 CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
-# CONFIG_CONSOLE_USB is not set
+CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
@@ -450,8 +445,6 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
 # CONFIG_SEABIOS_VGA_COREBOOT is not set
 CONFIG_PAYLOAD_FILE="grub.elf"