Update coreboot + merge GM45 hybrid GPU patches

Also add power_on_after_fail to X200 and others (prevents the bug
where the system would boot when connecting the AC adapter)
(option in menuconfig to use CMOS/nvram settings is now enabled)

Also NetDCDC is now the default USB debug dongle used (compatible
with the BBB rev C).

Add two new methods for managing coreboot configs:
./build config corebootreplace
./build config corebootmodify

13 files changed, 276 insertions, 132 deletions

diff --git a/resources/libreboot/config/macbook21/config b/resources/libreboot/config/macbook21/config
index 3f6752cb..845154dd 100644
--- a/resources/libreboot/config/macbook21/config
+++ b/resources/libreboot/config/macbook21/config
@@ -15,7 +15,7 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_CCACHE is not set
 # CONFIG_SCONFIG_GENPARSER is not set
 CONFIG_USE_OPTION_TABLE=y
-# CONFIG_STATIC_OPTION_TABLE is not set
+CONFIG_STATIC_OPTION_TABLE=y
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
@@ -26,6 +26,7 @@ CONFIG_EARLY_CBMEM_INIT=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
 # CONFIG_UPDATE_IMAGE is not set
 
 #
@@ -118,6 +119,7 @@ CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
 CONFIG_USBDEBUG_HCD_INDEX=0
+CONFIG_TTYS0_LCS=3
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
 CONFIG_POST_IO=y
@@ -146,6 +148,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
+# CONFIG_ARCH_MIPS is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
@@ -177,22 +180,28 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
-# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
-# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
 # CONFIG_ARCH_VERSTAGE_ARM64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_USE_SECURE_MONITOR is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
+# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
 # CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
+# CONFIG_ARCH_VERSTAGE_MIPS is not set
+# CONFIG_ARCH_ROMSTAGE_MIPS is not set
+# CONFIG_ARCH_RAMSTAGE_MIPS is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
@@ -208,6 +217,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_SOCKET_SPECIFIC_OPTIONS=y
 CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 CONFIG_CPU_INTEL_MODEL_6EX=y
@@ -270,6 +280,7 @@ CONFIG_EHCI_BAR=0xfef00000
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
+# CONFIG_LOCK_DOWN_BIOS is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
 
 #
@@ -313,6 +324,7 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
@@ -327,6 +339,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
+# CONFIG_GIC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
@@ -353,9 +366,9 @@ CONFIG_HAVE_USBDEBUG=y
 # CONFIG_HAVE_USBDEBUG_OPTIONS is not set
 CONFIG_USBDEBUG_IN_ROMSTAGE=y
 CONFIG_USBDEBUG_DEFAULT_PORT=0
-# CONFIG_USBDEBUG_DONGLE_STD is not set
+CONFIG_USBDEBUG_DONGLE_STD=y
 # CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y
+# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
 CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
@@ -379,13 +392,11 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
-CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
 CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -459,6 +470,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
+# CONFIG_BOARD_ID_SUPPORT is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
diff --git a/resources/libreboot/config/qemu_i440fx_piix4/config b/resources/libreboot/config/qemu_i440fx_piix4/config
index 70a23ca4..ab199084 100644
--- a/resources/libreboot/config/qemu_i440fx_piix4/config
+++ b/resources/libreboot/config/qemu_i440fx_piix4/config
@@ -25,6 +25,7 @@ CONFIG_EARLY_CBMEM_INIT=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
 # CONFIG_UPDATE_IMAGE is not set
 
 #
@@ -118,6 +119,7 @@ CONFIG_BOARD_EMULATION_QEMU_X86_I440FX=y
 CONFIG_BOARD_EMULATION_QEMU_X86=y
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
+CONFIG_TTYS0_LCS=3
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x800000
 CONFIG_POST_IO=y
@@ -144,6 +146,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
+# CONFIG_ARCH_MIPS is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
@@ -172,22 +175,28 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
-# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
-# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
 # CONFIG_ARCH_VERSTAGE_ARM64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_USE_SECURE_MONITOR is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
+# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
 # CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
+# CONFIG_ARCH_VERSTAGE_MIPS is not set
+# CONFIG_ARCH_ROMSTAGE_MIPS is not set
+# CONFIG_ARCH_RAMSTAGE_MIPS is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 # CONFIG_SYSTEM_TYPE_LAPTOP is not set
 
@@ -202,6 +211,7 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 CONFIG_SMM_TSEG_SIZE=0
@@ -249,6 +259,7 @@ CONFIG_MAX_PIRQ_LINKS=4
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON is not set
+# CONFIG_LOCK_DOWN_BIOS is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82371EB=y
 CONFIG_SOUTH_BRIDGE_OPTIONS=y
 
@@ -281,6 +292,8 @@ CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=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
@@ -310,6 +323,7 @@ CONFIG_FRAMEBUFFER_KEEP_VESA_MODE=y
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS=y
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_XRES=800
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_YRES=600
+# CONFIG_GIC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
@@ -356,12 +370,10 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
-CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_CONSOLE_QEMU_DEBUGCON=y
 CONFIG_CONSOLE_QEMU_DEBUGCON_PORT=0x402
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
@@ -416,6 +428,8 @@ 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"
@@ -433,6 +447,7 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_TRACE is not set
+# CONFIG_BOARD_ID_SUPPORT is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
diff --git a/resources/libreboot/config/qemu_q35_ich9/config b/resources/libreboot/config/qemu_q35_ich9/config
index 6585e226..9c048e94 100644
--- a/resources/libreboot/config/qemu_q35_ich9/config
+++ b/resources/libreboot/config/qemu_q35_ich9/config
@@ -24,6 +24,7 @@ CONFIG_EARLY_CBMEM_INIT=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
 # CONFIG_UPDATE_IMAGE is not set
 
 #
@@ -106,6 +107,7 @@ CONFIG_DCACHE_RAM_BASE=0xd0000
 CONFIG_DCACHE_RAM_SIZE=0x10000
 CONFIG_MMCONF_BASE_ADDRESS=0xb0000000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Emulation"
+CONFIG_BOOTBLOCK_MAINBOARD_INIT="mainboard/emulation/qemu-q35/bootblock.c"
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_UART_FOR_CONSOLE=0
@@ -115,9 +117,9 @@ CONFIG_BOARD_EMULATION_QEMU_X86_Q35=y
 # CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
 # CONFIG_BOARD_EMULATION_QEMU_UCB_RISCV is not set
 CONFIG_BOARD_EMULATION_QEMU_X86=y
-CONFIG_BOOTBLOCK_MAINBOARD_INIT="mainboard/emulation/qemu-q35/bootblock.c"
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
+CONFIG_TTYS0_LCS=3
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x800000
 CONFIG_POST_IO=y
@@ -145,6 +147,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
+# CONFIG_ARCH_MIPS is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
@@ -172,22 +175,28 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
-# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
-# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
 # CONFIG_ARCH_VERSTAGE_ARM64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_USE_SECURE_MONITOR is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
+# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
 # CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
+# CONFIG_ARCH_VERSTAGE_MIPS is not set
+# CONFIG_ARCH_ROMSTAGE_MIPS is not set
+# CONFIG_ARCH_RAMSTAGE_MIPS is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 # CONFIG_SYSTEM_TYPE_LAPTOP is not set
 
@@ -202,6 +211,7 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 CONFIG_SMM_TSEG_SIZE=0
@@ -252,6 +262,7 @@ CONFIG_EHCI_BAR=0xfef00000
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
+# CONFIG_LOCK_DOWN_BIOS is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -283,6 +294,8 @@ CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=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
@@ -295,6 +308,7 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
@@ -312,6 +326,7 @@ CONFIG_FRAMEBUFFER_KEEP_VESA_MODE=y
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS=y
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_XRES=800
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_YRES=600
+# CONFIG_GIC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
@@ -358,12 +373,10 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
-CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_CONSOLE_QEMU_DEBUGCON=y
 CONFIG_CONSOLE_QEMU_DEBUGCON_PORT=0x402
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
@@ -417,6 +430,8 @@ 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"
@@ -435,6 +450,7 @@ CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_TRACE is not set
+# CONFIG_BOARD_ID_SUPPORT is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
diff --git a/resources/libreboot/config/r400_4mb/config b/resources/libreboot/config/r400_4mb/config
index 3537c0d4..cc2f35fd 100644
--- a/resources/libreboot/config/r400_4mb/config
+++ b/resources/libreboot/config/r400_4mb/config
@@ -14,7 +14,8 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_SCONFIG_GENPARSER is not set
-# CONFIG_USE_OPTION_TABLE is not set
+CONFIG_USE_OPTION_TABLE=y
+CONFIG_STATIC_OPTION_TABLE=y
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
@@ -25,6 +26,7 @@ CONFIG_EARLY_CBMEM_INIT=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
 # CONFIG_UPDATE_IMAGE is not set
 
 #
@@ -96,7 +98,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_WINENT is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
-CONFIG_MAINBOARD_DIR="lenovo/x200"
+CONFIG_MAINBOARD_DIR="lenovo/t400"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad R400"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
@@ -115,6 +117,7 @@ CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
 CONFIG_USBDEBUG_HCD_INDEX=2
+CONFIG_TTYS0_LCS=3
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x3FD000
 CONFIG_POST_IO=y
@@ -157,6 +160,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
+# CONFIG_ARCH_MIPS is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
@@ -188,22 +192,28 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
-# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
-# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
 # CONFIG_ARCH_VERSTAGE_ARM64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_USE_SECURE_MONITOR is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
+# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
 # CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
+# CONFIG_ARCH_VERSTAGE_MIPS is not set
+# CONFIG_ARCH_ROMSTAGE_MIPS is not set
+# CONFIG_ARCH_RAMSTAGE_MIPS is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
@@ -218,6 +228,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 CONFIG_CPU_INTEL_MODEL_1067X=y
@@ -273,6 +284,7 @@ CONFIG_EHCI_BAR=0xfef00000
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
+# CONFIG_LOCK_DOWN_BIOS is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -319,6 +331,7 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
@@ -334,6 +347,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
+# CONFIG_GIC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
@@ -352,7 +366,7 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_TI_TPS65090 is not set
 CONFIG_DRIVERS_UART=y
 CONFIG_DRIVERS_UART_8250IO=y
-CONFIG_NO_UART_ON_SUPERIO=y
+# CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_HAVE_UART_SPECIAL is not set
 # CONFIG_DRIVERS_UART_OXPCIE is not set
@@ -361,9 +375,9 @@ CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
 CONFIG_USBDEBUG_IN_ROMSTAGE=y
 CONFIG_USBDEBUG_DEFAULT_PORT=0
-# CONFIG_USBDEBUG_DONGLE_STD is not set
+CONFIG_USBDEBUG_DONGLE_STD=y
 # CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y
+# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
 CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
@@ -387,13 +401,11 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
-CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
 CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -466,6 +478,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
+# CONFIG_BOARD_ID_SUPPORT is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
diff --git a/resources/libreboot/config/r400_8mb/config b/resources/libreboot/config/r400_8mb/config
index a019f6d9..edbe5398 100644
--- a/resources/libreboot/config/r400_8mb/config
+++ b/resources/libreboot/config/r400_8mb/config
@@ -14,7 +14,8 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_SCONFIG_GENPARSER is not set
-# CONFIG_USE_OPTION_TABLE is not set
+CONFIG_USE_OPTION_TABLE=y
+CONFIG_STATIC_OPTION_TABLE=y
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
@@ -25,6 +26,7 @@ CONFIG_EARLY_CBMEM_INIT=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
 # CONFIG_UPDATE_IMAGE is not set
 
 #
@@ -96,7 +98,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_WINENT is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
-CONFIG_MAINBOARD_DIR="lenovo/x200"
+CONFIG_MAINBOARD_DIR="lenovo/t400"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad R400"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
@@ -115,6 +117,7 @@ CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
 CONFIG_USBDEBUG_HCD_INDEX=2
+CONFIG_TTYS0_LCS=3
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x7FD000
 CONFIG_POST_IO=y
@@ -157,6 +160,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
+# CONFIG_ARCH_MIPS is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
@@ -188,22 +192,28 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
-# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
-# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
 # CONFIG_ARCH_VERSTAGE_ARM64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_USE_SECURE_MONITOR is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
+# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
 # CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
+# CONFIG_ARCH_VERSTAGE_MIPS is not set
+# CONFIG_ARCH_ROMSTAGE_MIPS is not set
+# CONFIG_ARCH_RAMSTAGE_MIPS is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
@@ -218,6 +228,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 CONFIG_CPU_INTEL_MODEL_1067X=y
@@ -273,6 +284,7 @@ CONFIG_EHCI_BAR=0xfef00000
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
+# CONFIG_LOCK_DOWN_BIOS is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -319,6 +331,7 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
@@ -334,6 +347,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
+# CONFIG_GIC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
@@ -352,7 +366,7 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_TI_TPS65090 is not set
 CONFIG_DRIVERS_UART=y
 CONFIG_DRIVERS_UART_8250IO=y
-CONFIG_NO_UART_ON_SUPERIO=y
+# CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_HAVE_UART_SPECIAL is not set
 # CONFIG_DRIVERS_UART_OXPCIE is not set
@@ -361,9 +375,9 @@ CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
 CONFIG_USBDEBUG_IN_ROMSTAGE=y
 CONFIG_USBDEBUG_DEFAULT_PORT=0
-# CONFIG_USBDEBUG_DONGLE_STD is not set
+CONFIG_USBDEBUG_DONGLE_STD=y
 # CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y
+# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
 CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
@@ -387,13 +401,11 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
-CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
 CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -466,6 +478,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
+# CONFIG_BOARD_ID_SUPPORT is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
diff --git a/resources/libreboot/config/t400_4mb/config b/resources/libreboot/config/t400_4mb/config
index 678bea25..aa269c11 100644
--- a/resources/libreboot/config/t400_4mb/config
+++ b/resources/libreboot/config/t400_4mb/config
@@ -14,7 +14,8 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_SCONFIG_GENPARSER is not set
-# CONFIG_USE_OPTION_TABLE is not set
+CONFIG_USE_OPTION_TABLE=y
+CONFIG_STATIC_OPTION_TABLE=y
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
@@ -25,6 +26,7 @@ CONFIG_EARLY_CBMEM_INIT=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
 # CONFIG_UPDATE_IMAGE is not set
 
 #
@@ -96,7 +98,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_WINENT is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
-CONFIG_MAINBOARD_DIR="lenovo/x200"
+CONFIG_MAINBOARD_DIR="lenovo/t400"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad T400"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
@@ -115,6 +117,7 @@ CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
 CONFIG_USBDEBUG_HCD_INDEX=2
+CONFIG_TTYS0_LCS=3
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x3FD000
 CONFIG_POST_IO=y
@@ -157,6 +160,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
+# CONFIG_ARCH_MIPS is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
@@ -188,22 +192,28 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
-# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
-# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
 # CONFIG_ARCH_VERSTAGE_ARM64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_USE_SECURE_MONITOR is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
+# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
 # CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
+# CONFIG_ARCH_VERSTAGE_MIPS is not set
+# CONFIG_ARCH_ROMSTAGE_MIPS is not set
+# CONFIG_ARCH_RAMSTAGE_MIPS is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
@@ -218,6 +228,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 CONFIG_CPU_INTEL_MODEL_1067X=y
@@ -273,6 +284,7 @@ CONFIG_EHCI_BAR=0xfef00000
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
+# CONFIG_LOCK_DOWN_BIOS is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -319,6 +331,7 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
@@ -334,6 +347,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
+# CONFIG_GIC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
@@ -352,7 +366,7 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_TI_TPS65090 is not set
 CONFIG_DRIVERS_UART=y
 CONFIG_DRIVERS_UART_8250IO=y
-CONFIG_NO_UART_ON_SUPERIO=y
+# CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_HAVE_UART_SPECIAL is not set
 # CONFIG_DRIVERS_UART_OXPCIE is not set
@@ -361,9 +375,9 @@ CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
 CONFIG_USBDEBUG_IN_ROMSTAGE=y
 CONFIG_USBDEBUG_DEFAULT_PORT=0
-# CONFIG_USBDEBUG_DONGLE_STD is not set
+CONFIG_USBDEBUG_DONGLE_STD=y
 # CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y
+# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
 CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
@@ -387,13 +401,11 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
-CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
 CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -434,7 +446,7 @@ CONFIG_GENERATE_MP_TABLE=y
 # CONFIG_GENERATE_PIRQ_TABLE is not set
 CONFIG_GENERATE_SMBIOS_TABLES=y
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T400"
 
 #
 # Payload
@@ -466,6 +478,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
+# CONFIG_BOARD_ID_SUPPORT is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
diff --git a/resources/libreboot/config/t400_8mb/config b/resources/libreboot/config/t400_8mb/config
index d89ad9b0..765e14de 100644
--- a/resources/libreboot/config/t400_8mb/config
+++ b/resources/libreboot/config/t400_8mb/config
@@ -14,7 +14,8 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_SCONFIG_GENPARSER is not set
-# CONFIG_USE_OPTION_TABLE is not set
+CONFIG_USE_OPTION_TABLE=y
+CONFIG_STATIC_OPTION_TABLE=y
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
@@ -25,6 +26,7 @@ CONFIG_EARLY_CBMEM_INIT=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
 # CONFIG_UPDATE_IMAGE is not set
 
 #
@@ -96,7 +98,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_WINENT is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
-CONFIG_MAINBOARD_DIR="lenovo/x200"
+CONFIG_MAINBOARD_DIR="lenovo/t400"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad T400"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
@@ -115,6 +117,7 @@ CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
 CONFIG_USBDEBUG_HCD_INDEX=2
+CONFIG_TTYS0_LCS=3
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x7FD000
 CONFIG_POST_IO=y
@@ -157,6 +160,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
+# CONFIG_ARCH_MIPS is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
@@ -188,22 +192,28 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
-# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
-# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
 # CONFIG_ARCH_VERSTAGE_ARM64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_USE_SECURE_MONITOR is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
+# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
 # CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
+# CONFIG_ARCH_VERSTAGE_MIPS is not set
+# CONFIG_ARCH_ROMSTAGE_MIPS is not set
+# CONFIG_ARCH_RAMSTAGE_MIPS is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
@@ -218,6 +228,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 CONFIG_CPU_INTEL_MODEL_1067X=y
@@ -273,6 +284,7 @@ CONFIG_EHCI_BAR=0xfef00000
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
+# CONFIG_LOCK_DOWN_BIOS is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -319,6 +331,7 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
@@ -334,6 +347,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
+# CONFIG_GIC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
@@ -352,7 +366,7 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_TI_TPS65090 is not set
 CONFIG_DRIVERS_UART=y
 CONFIG_DRIVERS_UART_8250IO=y
-CONFIG_NO_UART_ON_SUPERIO=y
+# CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_HAVE_UART_SPECIAL is not set
 # CONFIG_DRIVERS_UART_OXPCIE is not set
@@ -361,9 +375,9 @@ CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
 CONFIG_USBDEBUG_IN_ROMSTAGE=y
 CONFIG_USBDEBUG_DEFAULT_PORT=0
-# CONFIG_USBDEBUG_DONGLE_STD is not set
+CONFIG_USBDEBUG_DONGLE_STD=y
 # CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y
+# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
 CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
@@ -387,13 +401,11 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
-CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
 CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -434,7 +446,7 @@ CONFIG_GENERATE_MP_TABLE=y
 # CONFIG_GENERATE_PIRQ_TABLE is not set
 CONFIG_GENERATE_SMBIOS_TABLES=y
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T400"
 
 #
 # Payload
@@ -466,6 +478,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
+# CONFIG_BOARD_ID_SUPPORT is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
diff --git a/resources/libreboot/config/t500_4mb/config b/resources/libreboot/config/t500_4mb/config
index a488c871..b4df5d87 100644
--- a/resources/libreboot/config/t500_4mb/config
+++ b/resources/libreboot/config/t500_4mb/config
@@ -14,7 +14,8 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_SCONFIG_GENPARSER is not set
-# CONFIG_USE_OPTION_TABLE is not set
+CONFIG_USE_OPTION_TABLE=y
+CONFIG_STATIC_OPTION_TABLE=y
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
@@ -25,6 +26,7 @@ CONFIG_EARLY_CBMEM_INIT=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
 # CONFIG_UPDATE_IMAGE is not set
 
 #
@@ -96,7 +98,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_WINENT is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
-CONFIG_MAINBOARD_DIR="lenovo/x200"
+CONFIG_MAINBOARD_DIR="lenovo/t400"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad T500"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
@@ -115,6 +117,7 @@ CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
 CONFIG_USBDEBUG_HCD_INDEX=2
+CONFIG_TTYS0_LCS=3
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x3FD000
 CONFIG_POST_IO=y
@@ -157,6 +160,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
+# CONFIG_ARCH_MIPS is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
@@ -188,22 +192,28 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
-# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
-# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
 # CONFIG_ARCH_VERSTAGE_ARM64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_USE_SECURE_MONITOR is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
+# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
 # CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
+# CONFIG_ARCH_VERSTAGE_MIPS is not set
+# CONFIG_ARCH_ROMSTAGE_MIPS is not set
+# CONFIG_ARCH_RAMSTAGE_MIPS is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
@@ -218,6 +228,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 CONFIG_CPU_INTEL_MODEL_1067X=y
@@ -273,6 +284,7 @@ CONFIG_EHCI_BAR=0xfef00000
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
+# CONFIG_LOCK_DOWN_BIOS is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -319,6 +331,7 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
@@ -334,6 +347,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
+# CONFIG_GIC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
@@ -352,7 +366,7 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_TI_TPS65090 is not set
 CONFIG_DRIVERS_UART=y
 CONFIG_DRIVERS_UART_8250IO=y
-CONFIG_NO_UART_ON_SUPERIO=y
+# CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_HAVE_UART_SPECIAL is not set
 # CONFIG_DRIVERS_UART_OXPCIE is not set
@@ -361,9 +375,9 @@ CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
 CONFIG_USBDEBUG_IN_ROMSTAGE=y
 CONFIG_USBDEBUG_DEFAULT_PORT=0
-# CONFIG_USBDEBUG_DONGLE_STD is not set
+CONFIG_USBDEBUG_DONGLE_STD=y
 # CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y
+# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
 CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
@@ -387,13 +401,11 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
-CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
 CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -434,7 +446,7 @@ CONFIG_GENERATE_MP_TABLE=y
 # CONFIG_GENERATE_PIRQ_TABLE is not set
 CONFIG_GENERATE_SMBIOS_TABLES=y
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T500"
 
 #
 # Payload
@@ -466,6 +478,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
+# CONFIG_BOARD_ID_SUPPORT is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
diff --git a/resources/libreboot/config/t500_8mb/config b/resources/libreboot/config/t500_8mb/config
index a5219e61..46ff494b 100644
--- a/resources/libreboot/config/t500_8mb/config
+++ b/resources/libreboot/config/t500_8mb/config
@@ -14,7 +14,8 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_SCONFIG_GENPARSER is not set
-# CONFIG_USE_OPTION_TABLE is not set
+CONFIG_USE_OPTION_TABLE=y
+CONFIG_STATIC_OPTION_TABLE=y
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
@@ -25,6 +26,7 @@ CONFIG_EARLY_CBMEM_INIT=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
 # CONFIG_UPDATE_IMAGE is not set
 
 #
@@ -96,7 +98,7 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_WINENT is not set
 # CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
-CONFIG_MAINBOARD_DIR="lenovo/x200"
+CONFIG_MAINBOARD_DIR="lenovo/t400"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad T500"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
@@ -115,6 +117,7 @@ CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
 CONFIG_USBDEBUG_HCD_INDEX=2
+CONFIG_TTYS0_LCS=3
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x7FD000
 CONFIG_POST_IO=y
@@ -157,6 +160,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
+# CONFIG_ARCH_MIPS is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
@@ -188,22 +192,28 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
-# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
-# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
 # CONFIG_ARCH_VERSTAGE_ARM64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_USE_SECURE_MONITOR is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
+# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
 # CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
+# CONFIG_ARCH_VERSTAGE_MIPS is not set
+# CONFIG_ARCH_ROMSTAGE_MIPS is not set
+# CONFIG_ARCH_RAMSTAGE_MIPS is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
@@ -218,6 +228,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 CONFIG_CPU_INTEL_MODEL_1067X=y
@@ -273,6 +284,7 @@ CONFIG_EHCI_BAR=0xfef00000
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
+# CONFIG_LOCK_DOWN_BIOS is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -319,6 +331,7 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
@@ -334,6 +347,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
+# CONFIG_GIC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
@@ -352,7 +366,7 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_TI_TPS65090 is not set
 CONFIG_DRIVERS_UART=y
 CONFIG_DRIVERS_UART_8250IO=y
-CONFIG_NO_UART_ON_SUPERIO=y
+# CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_HAVE_UART_SPECIAL is not set
 # CONFIG_DRIVERS_UART_OXPCIE is not set
@@ -361,9 +375,9 @@ CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
 CONFIG_USBDEBUG_IN_ROMSTAGE=y
 CONFIG_USBDEBUG_DEFAULT_PORT=0
-# CONFIG_USBDEBUG_DONGLE_STD is not set
+CONFIG_USBDEBUG_DONGLE_STD=y
 # CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y
+# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
 CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
@@ -387,13 +401,11 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
-CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
 CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -434,7 +446,7 @@ CONFIG_GENERATE_MP_TABLE=y
 # CONFIG_GENERATE_PIRQ_TABLE is not set
 CONFIG_GENERATE_SMBIOS_TABLES=y
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T500"
 
 #
 # Payload
@@ -466,6 +478,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
+# CONFIG_BOARD_ID_SUPPORT is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
diff --git a/resources/libreboot/config/t60/config b/resources/libreboot/config/t60/config
index 9accfb2c..77bb0ccd 100644
--- a/resources/libreboot/config/t60/config
+++ b/resources/libreboot/config/t60/config
@@ -14,7 +14,8 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_SCONFIG_GENPARSER is not set
-# CONFIG_USE_OPTION_TABLE is not set
+CONFIG_USE_OPTION_TABLE=y
+CONFIG_STATIC_OPTION_TABLE=y
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
@@ -25,6 +26,7 @@ CONFIG_EARLY_CBMEM_INIT=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
 # CONFIG_UPDATE_IMAGE is not set
 
 #
@@ -115,6 +117,7 @@ CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
 CONFIG_USBDEBUG_HCD_INDEX=0
+CONFIG_TTYS0_LCS=3
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
 CONFIG_POST_IO=y
@@ -157,6 +160,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
+# CONFIG_ARCH_MIPS is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
@@ -188,22 +192,28 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
-# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
-# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
 # CONFIG_ARCH_VERSTAGE_ARM64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_USE_SECURE_MONITOR is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
+# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
 # CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
+# CONFIG_ARCH_VERSTAGE_MIPS is not set
+# CONFIG_ARCH_ROMSTAGE_MIPS is not set
+# CONFIG_ARCH_RAMSTAGE_MIPS is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
@@ -219,6 +229,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_SOCKET_SPECIFIC_OPTIONS=y
 CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 CONFIG_CPU_INTEL_MODEL_6EX=y
@@ -281,6 +292,7 @@ CONFIG_EHCI_BAR=0xfef00000
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
+# CONFIG_LOCK_DOWN_BIOS is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
 CONFIG_SOUTHBRIDGE_TI_PCI1X2X=y
 
@@ -331,6 +343,7 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
@@ -345,6 +358,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
+# CONFIG_GIC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
@@ -372,9 +386,9 @@ CONFIG_HAVE_USBDEBUG=y
 # CONFIG_HAVE_USBDEBUG_OPTIONS is not set
 CONFIG_USBDEBUG_IN_ROMSTAGE=y
 CONFIG_USBDEBUG_DEFAULT_PORT=0
-# CONFIG_USBDEBUG_DONGLE_STD is not set
+CONFIG_USBDEBUG_DONGLE_STD=y
 # CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y
+# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
 CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
@@ -398,13 +412,11 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
-CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
 CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -478,6 +490,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
+# CONFIG_BOARD_ID_SUPPORT is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
diff --git a/resources/libreboot/config/x200_4mb/config b/resources/libreboot/config/x200_4mb/config
index c57404e8..c673b824 100644
--- a/resources/libreboot/config/x200_4mb/config
+++ b/resources/libreboot/config/x200_4mb/config
@@ -14,7 +14,8 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_SCONFIG_GENPARSER is not set
-# CONFIG_USE_OPTION_TABLE is not set
+CONFIG_USE_OPTION_TABLE=y
+CONFIG_STATIC_OPTION_TABLE=y
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
@@ -25,6 +26,7 @@ CONFIG_EARLY_CBMEM_INIT=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
 # CONFIG_UPDATE_IMAGE is not set
 
 #
@@ -110,7 +112,6 @@ CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
-CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
@@ -157,6 +158,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
+# CONFIG_ARCH_MIPS is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
@@ -188,22 +190,28 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
-# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
-# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
 # CONFIG_ARCH_VERSTAGE_ARM64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_USE_SECURE_MONITOR is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
+# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
 # CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
+# CONFIG_ARCH_VERSTAGE_MIPS is not set
+# CONFIG_ARCH_ROMSTAGE_MIPS is not set
+# CONFIG_ARCH_RAMSTAGE_MIPS is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
@@ -218,6 +226,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 CONFIG_CPU_INTEL_MODEL_1067X=y
@@ -273,6 +282,7 @@ CONFIG_EHCI_BAR=0xfef00000
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
+# CONFIG_LOCK_DOWN_BIOS is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -289,7 +299,6 @@ CONFIG_EC_LENOVO_PMH7=y
 #
 # SoC
 #
-CONFIG_TTYS0_BASE=0x3f8
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
 # CONFIG_SOC_NVIDIA_TEGRA132 is not set
 CONFIG_CONSOLE_PRERAM_BUFFER_BASE=0x0
@@ -319,6 +328,7 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
@@ -334,6 +344,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
+# CONFIG_GIC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
@@ -350,8 +361,8 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVERS_SIL_3114 is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
-CONFIG_DRIVERS_UART=y
-CONFIG_DRIVERS_UART_8250IO=y
+# CONFIG_DRIVERS_UART is not set
+# CONFIG_DRIVERS_UART_8250IO is not set
 CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_HAVE_UART_SPECIAL is not set
@@ -361,9 +372,9 @@ CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
 CONFIG_USBDEBUG_IN_ROMSTAGE=y
 CONFIG_USBDEBUG_DEFAULT_PORT=0
-# CONFIG_USBDEBUG_DONGLE_STD is not set
+CONFIG_USBDEBUG_DONGLE_STD=y
 # CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y
+# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
 CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
@@ -376,24 +387,11 @@ CONFIG_MMCONF_SUPPORT=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-CONFIG_CONSOLE_SERIAL=y
-
-#
-# I/O mapped, 8250-compatible
-#
-CONFIG_CONSOLE_SERIAL_115200=y
-# CONFIG_CONSOLE_SERIAL_57600 is not set
-# CONFIG_CONSOLE_SERIAL_38400 is not set
-# CONFIG_CONSOLE_SERIAL_19200 is not set
-# CONFIG_CONSOLE_SERIAL_9600 is not set
-CONFIG_TTYS0_BAUD=115200
-CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
 CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -466,6 +464,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
+# CONFIG_BOARD_ID_SUPPORT is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
diff --git a/resources/libreboot/config/x200_8mb/config b/resources/libreboot/config/x200_8mb/config
index 377e62ae..dd812535 100644
--- a/resources/libreboot/config/x200_8mb/config
+++ b/resources/libreboot/config/x200_8mb/config
@@ -14,7 +14,8 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_SCONFIG_GENPARSER is not set
-# CONFIG_USE_OPTION_TABLE is not set
+CONFIG_USE_OPTION_TABLE=y
+CONFIG_STATIC_OPTION_TABLE=y
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
@@ -25,6 +26,7 @@ CONFIG_EARLY_CBMEM_INIT=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
 # CONFIG_UPDATE_IMAGE is not set
 
 #
@@ -110,7 +112,6 @@ CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
-CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
@@ -157,6 +158,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
+# CONFIG_ARCH_MIPS is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
@@ -188,22 +190,28 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
-# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
-# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
 # CONFIG_ARCH_VERSTAGE_ARM64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_USE_SECURE_MONITOR is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
+# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
 # CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
+# CONFIG_ARCH_VERSTAGE_MIPS is not set
+# CONFIG_ARCH_ROMSTAGE_MIPS is not set
+# CONFIG_ARCH_RAMSTAGE_MIPS is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
@@ -218,6 +226,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 CONFIG_CPU_INTEL_MODEL_1067X=y
@@ -273,6 +282,7 @@ CONFIG_EHCI_BAR=0xfef00000
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
+# CONFIG_LOCK_DOWN_BIOS is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -289,7 +299,6 @@ CONFIG_EC_LENOVO_PMH7=y
 #
 # SoC
 #
-CONFIG_TTYS0_BASE=0x3f8
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
 # CONFIG_SOC_NVIDIA_TEGRA132 is not set
 CONFIG_CONSOLE_PRERAM_BUFFER_BASE=0x0
@@ -319,6 +328,7 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
@@ -334,6 +344,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
+# CONFIG_GIC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
@@ -350,8 +361,8 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVERS_SIL_3114 is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
-CONFIG_DRIVERS_UART=y
-CONFIG_DRIVERS_UART_8250IO=y
+# CONFIG_DRIVERS_UART is not set
+# CONFIG_DRIVERS_UART_8250IO is not set
 CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_HAVE_UART_SPECIAL is not set
@@ -361,9 +372,9 @@ CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
 CONFIG_USBDEBUG_IN_ROMSTAGE=y
 CONFIG_USBDEBUG_DEFAULT_PORT=0
-# CONFIG_USBDEBUG_DONGLE_STD is not set
+CONFIG_USBDEBUG_DONGLE_STD=y
 # CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y
+# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
 CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
@@ -376,24 +387,11 @@ CONFIG_MMCONF_SUPPORT=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-CONFIG_CONSOLE_SERIAL=y
-
-#
-# I/O mapped, 8250-compatible
-#
-CONFIG_CONSOLE_SERIAL_115200=y
-# CONFIG_CONSOLE_SERIAL_57600 is not set
-# CONFIG_CONSOLE_SERIAL_38400 is not set
-# CONFIG_CONSOLE_SERIAL_19200 is not set
-# CONFIG_CONSOLE_SERIAL_9600 is not set
-CONFIG_TTYS0_BAUD=115200
-CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
 CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -466,6 +464,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
+# CONFIG_BOARD_ID_SUPPORT is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
diff --git a/resources/libreboot/config/x60/config b/resources/libreboot/config/x60/config
index 27d795d9..14942839 100644
--- a/resources/libreboot/config/x60/config
+++ b/resources/libreboot/config/x60/config
@@ -15,7 +15,7 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_CCACHE is not set
 # CONFIG_SCONFIG_GENPARSER is not set
 CONFIG_USE_OPTION_TABLE=y
-# CONFIG_STATIC_OPTION_TABLE is not set
+CONFIG_STATIC_OPTION_TABLE=y
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
@@ -26,6 +26,7 @@ CONFIG_EARLY_CBMEM_INIT=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
 # CONFIG_UPDATE_IMAGE is not set
 
 #
@@ -117,6 +118,7 @@ CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x200000
 CONFIG_STACK_SIZE=0x1000
 CONFIG_USBDEBUG_HCD_INDEX=0
+CONFIG_TTYS0_LCS=3
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
 CONFIG_POST_IO=y
@@ -159,6 +161,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
+# CONFIG_ARCH_MIPS is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
@@ -190,22 +193,28 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
-# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
-# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
 # CONFIG_ARCH_VERSTAGE_ARM64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARM64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_USE_SECURE_MONITOR is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
+# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
 # CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
+# CONFIG_ARCH_VERSTAGE_MIPS is not set
+# CONFIG_ARCH_ROMSTAGE_MIPS is not set
+# CONFIG_ARCH_RAMSTAGE_MIPS is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 
@@ -221,6 +230,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_SOCKET_SPECIFIC_OPTIONS=y
 CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 CONFIG_CPU_INTEL_MODEL_6EX=y
@@ -283,6 +293,7 @@ CONFIG_EHCI_BAR=0xfef00000
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
+# CONFIG_LOCK_DOWN_BIOS is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
 CONFIG_SOUTHBRIDGE_RICOH_RL5C476=y
 
@@ -333,6 +344,7 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
+# CONFIG_PCIEXP_L1_SUB_STATE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
@@ -347,6 +359,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # Generic Drivers
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
+# CONFIG_GIC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
@@ -377,9 +390,9 @@ CONFIG_HAVE_USBDEBUG=y
 # CONFIG_HAVE_USBDEBUG_OPTIONS is not set
 CONFIG_USBDEBUG_IN_ROMSTAGE=y
 CONFIG_USBDEBUG_DEFAULT_PORT=0
-# CONFIG_USBDEBUG_DONGLE_STD is not set
+CONFIG_USBDEBUG_DONGLE_STD=y
 # CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
-CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK=y
+# CONFIG_USBDEBUG_DONGLE_BEAGLEBONE_BLACK is not set
 CONFIG_USBDEBUG_OPTIONAL_HUB_PORT=0
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
@@ -403,13 +416,11 @@ CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
 CONFIG_TTYS0_BAUD=115200
-CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
 CONFIG_CONSOLE_USB=y
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -485,6 +496,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_DEBUG_USBDEBUG is not set
 # CONFIG_TRACE is not set
+# CONFIG_BOARD_ID_SUPPORT is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set