Update coreboot

Update to new coreboot revision:
83b05eb0a85d7b7ac0837cece67afabbdb46ea65

Intel microcode updates are no longer deleted, because these no
longer exist in the main coreboot branch. Instead, they exist in
the optional 3rdparty repository which libreboot does not merge.
note: the microcode in src/soc/intel/ still exists and is still
deleted in libreboot, therefore

TODO: delete the instructions in coreboot that download the
3rdparty branch

MacBook2,1 cstate patch is no longer cherry picked, because this
is now merged in the main coreboot repository.

The patch to disable use of timestamps in non-git is now removed,
because a better version of patch was submitted to and merged in
coreboot.

coreboot-libre:
These blobs either don't exist in coreboot anymore, or have had
their names changed. They are no longer listed in the deblob
script:
src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000025.c
src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000028.c
src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000101.c
src/cpu/amd/model_10xxx/mc_patch_01000086.h
src/cpu/amd/model_10xxx/mc_patch_0100009f.h
src/cpu/amd/model_10xxx/mc_patch_010000b6.h
src/cpu/amd/model_10xxx/mc_patch_010000bf.h
src/cpu/amd/model_10xxx/mc_patch_010000c4.h
src/northbridge/amd/agesa/family12/ssdt.asl

coreboot-libre:
These nonblobs either don't exist in coreboot anymore, or have had
their names changed. They are no longer listed in the nonblobs
or nonblobs_notes files:
./src/mainboard/digitallogic/msm586seg/mainboard.c
./src/mainboard/intel/jarrell/irq_tables.c
./src/mainboard/supermicro/x6dai_g/irq_tables.c
./src/mainboard/technologic/ts5300/mainboard.c
./src/mainboard/via/epia/irq_tables.c
./src/northbridge/via/vx800/examples/chipset_init.c
./src/southbridge/amd/cs5530/bitmap.c
./src/southbridge/amd/pi/avalon/Kconfig
./src/mainboard/google/samus/samsung_8Gb.spd.hex
./src/mainboard/google/samus/empty.spd.hex
./src/mainboard/google/samus/elpida_4Gb.spd.hex
./src/mainboard/google/samus/elpida_8Gb.spd.hex
./src/mainboard/google/samus/samsung_4Gb.spd.hex

coreboot-libre:
The following were added to the nonblobs file:
./src/mainboard/google/samus/spd/samsung_4Gb.spd.hex
./src/mainboard/google/samus/spd/empty.spd.hex
./src/mainboard/google/samus/spd/elpida_8Gb.spd.hex
./src/mainboard/google/samus/spd/hynix_4Gb.spd.hex
./src/mainboard/google/samus/spd/samsung_8Gb.spd.hex
./src/mainboard/google/samus/spd/hynix_8Gb.spd.hex
./src/mainboard/google/samus/spd/elpida_4Gb.spd.hex
./src/drivers/xgi/common/vb_table.h
./src/drivers/xgi/common/vb_setmode.c
./src/drivers/xgi/common/XGI_main.h
./src/mainboard/siemens/mc_tcu3/romstage.c
./src/mainboard/siemens/mc_tcu3/lcd_panel.c
./src/mainboard/siemens/mc_tcu3/modhwinfo.c
./src/mainboard/pcengines/apu1/Kconfig
./src/mainboard/asus/kfsn4-dre/get_bus_conf.c
./src/mainboard/google/samus/spd/spd.c
./src/mainboard/hp/abm/mptable.c
./src/northbridge/amd/pi/00630F01/Kconfig
./src/cpu/amd/microcode/microcode.c
./src/lib/tlcl_structures.h

coreboot-libre:
New blobs in coreboot are now deleted in libreboot:
src/soc/intel/baytrail/microcode/M0C3067_0000031E.h
src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000119.c
src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000029.c
src/cpu/amd/model_10xxx/mc_patch_010000d9.h
src/cpu/amd/model_10xxx/mc_patch_010000dc.h
src/cpu/amd/model_10xxx/mc_patch_010000db.h
src/cpu/amd/model_10xxx/mc_patch_010000c7.h
src/cpu/amd/model_10xxx/mc_patch_010000c8.h

10 files changed, 237 insertions, 273 deletions

diff --git a/resources/libreboot/config/macbook21/config b/resources/libreboot/config/macbook21/config
index ef857286..b96532e8 100644
--- a/resources/libreboot/config/macbook21/config
+++ b/resources/libreboot/config/macbook21/config
@@ -15,11 +15,10 @@ 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_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
-# CONFIG_BROKEN_CAR_MIGRATE is not set
-CONFIG_DYNAMIC_CBMEM=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
@@ -36,18 +35,15 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_ABIT is not set
 # CONFIG_VENDOR_ADLINK is not set
 # CONFIG_VENDOR_ADVANSUS is not set
-# CONFIG_VENDOR_ADVANTECH is not set
 # CONFIG_VENDOR_AMD is not set
 # CONFIG_VENDOR_AOPEN is not set
 CONFIG_VENDOR_APPLE=y
 # CONFIG_VENDOR_ARIMA is not set
 # CONFIG_VENDOR_ARTECGROUP is not set
-# CONFIG_VENDOR_ASI is not set
 # CONFIG_VENDOR_ASROCK is not set
 # CONFIG_VENDOR_ASUS is not set
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AVALUE is not set
-# CONFIG_VENDOR_AXUS is not set
 # CONFIG_VENDOR_AZZA is not set
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BCOM is not set
@@ -58,7 +54,6 @@ CONFIG_VENDOR_APPLE=y
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
-# CONFIG_VENDOR_EAGLELION is not set
 # CONFIG_VENDOR_ECS is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_GETAC is not set
@@ -94,8 +89,6 @@ CONFIG_VENDOR_APPLE=y
 # CONFIG_VENDOR_SUNW is not set
 # CONFIG_VENDOR_SUPERMICRO is not set
 # CONFIG_VENDOR_TECHNEXION is not set
-# CONFIG_VENDOR_TECHNOLOGIC is not set
-# CONFIG_VENDOR_TELEVIDEO is not set
 # CONFIG_VENDOR_TI is not set
 # CONFIG_VENDOR_THOMSON is not set
 # CONFIG_VENDOR_TRAVERSE is not set
@@ -109,10 +102,8 @@ CONFIG_MAINBOARD_PART_NUMBER="MacBook2,1"
 CONFIG_MAINBOARD_VENDOR="Apple"
 CONFIG_MAX_CPUS=2
 CONFIG_VGA_BIOS_ID="8086,27a2"
-CONFIG_DRIVERS_PS2_KEYBOARD=y
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 # CONFIG_VGA_BIOS is not set
-# CONFIG_CONSOLE_POST is not set
 # CONFIG_UDELAY_IO is not set
 CONFIG_DCACHE_RAM_BASE=0xffdf8000
 CONFIG_DCACHE_RAM_SIZE=0x8000
@@ -121,6 +112,7 @@ CONFIG_BOARD_APPLE_MACBOOK21=y
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Apple Inc."
 # 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
@@ -135,6 +127,7 @@ CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_USBDEBUG=y
 CONFIG_MAINBOARD_VERSION="1.0"
+CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
 CONFIG_BOARD_ROMSIZE_KB_2048=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -154,6 +147,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
+CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
 CONFIG_AP_IN_SIPI_WAIT=y
@@ -161,6 +155,7 @@ CONFIG_AP_IN_SIPI_WAIT=y
 CONFIG_RAMBASE=0x100000
 CONFIG_NUM_IPI_STARTS=2
 # CONFIG_ROMCC is not set
+# CONFIG_LATE_CBMEM_INIT is not set
 CONFIG_PC80_SYSTEM=y
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/i945/bootblock.c"
 CONFIG_HAVE_CMOS_DEFAULT=y
@@ -170,24 +165,31 @@ CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
 CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
+# CONFIG_ARCH_VERSTAGE_ARM is not set
 # CONFIG_ARCH_ROMSTAGE_ARM is not set
 # CONFIG_ARCH_RAMSTAGE_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set
+# CONFIG_ARCH_VERSTAGE_ARMV4 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV4 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV4 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7 is not set
 # 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_BOOTBLOCK_ARM_V8_64 is not set
-# CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set
-# CONFIG_ARCH_RAMSTAGE_ARM_V8_64 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_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
@@ -281,7 +283,10 @@ CONFIG_SOUTHBRIDGE_INTEL_I82801GX=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
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
@@ -291,8 +296,8 @@ CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
 # Devices
 #
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
+CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 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_MULTIPLE_VGA_ADAPTERS is not set
@@ -301,16 +306,16 @@ CONFIG_PCI=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_AGP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 # CONFIG_PCIEXP_COMMON_CLOCK is not set
 # CONFIG_PCIEXP_ASPM is not set
-CONFIG_PCI_BUS_SEGN_BITS=0
+# CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
+# CONFIG_SOFTWARE_I2C is not set
 
 #
 # Display
@@ -320,17 +325,19 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 #
 # Generic Drivers
 #
+# CONFIG_DRIVERS_AS3722_RTC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-# CONFIG_I2C_TPM is not set
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
+# CONFIG_DRIVER_INTEL_I210 is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_LPC_TPM is not set
+CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVERS_SIL_3114 is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
@@ -365,7 +372,6 @@ CONFIG_CONSOLE_SERIAL=y
 #
 # I/O mapped, 8250-compatible
 #
-CONFIG_TTYS0_BASE=0x3f8
 CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
@@ -390,6 +396,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_NO_POST is not set
 # CONFIG_CMOS_POST is not set
+# CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
diff --git a/resources/libreboot/config/qemu_i440fx_piix4/config b/resources/libreboot/config/qemu_i440fx_piix4/config
index 50d2404c..44ab2071 100644
--- a/resources/libreboot/config/qemu_i440fx_piix4/config
+++ b/resources/libreboot/config/qemu_i440fx_piix4/config
@@ -18,8 +18,6 @@ CONFIG_COMPILER_GCC=y
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
-# CONFIG_BROKEN_CAR_MIGRATE is not set
-CONFIG_DYNAMIC_CBMEM=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
@@ -36,18 +34,15 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_ABIT is not set
 # CONFIG_VENDOR_ADLINK is not set
 # CONFIG_VENDOR_ADVANSUS is not set
-# CONFIG_VENDOR_ADVANTECH is not set
 # CONFIG_VENDOR_AMD is not set
 # CONFIG_VENDOR_AOPEN is not set
 # CONFIG_VENDOR_APPLE is not set
 # CONFIG_VENDOR_ARIMA is not set
 # CONFIG_VENDOR_ARTECGROUP is not set
-# CONFIG_VENDOR_ASI is not set
 # CONFIG_VENDOR_ASROCK is not set
 # CONFIG_VENDOR_ASUS is not set
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AVALUE is not set
-# CONFIG_VENDOR_AXUS is not set
 # CONFIG_VENDOR_AZZA is not set
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BCOM is not set
@@ -58,7 +53,6 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
-# CONFIG_VENDOR_EAGLELION is not set
 # CONFIG_VENDOR_ECS is not set
 CONFIG_VENDOR_EMULATION=y
 # CONFIG_VENDOR_GETAC is not set
@@ -94,8 +88,6 @@ CONFIG_VENDOR_EMULATION=y
 # CONFIG_VENDOR_SUNW is not set
 # CONFIG_VENDOR_SUPERMICRO is not set
 # CONFIG_VENDOR_TECHNEXION is not set
-# CONFIG_VENDOR_TECHNOLOGIC is not set
-# CONFIG_VENDOR_TELEVIDEO is not set
 # CONFIG_VENDOR_TI is not set
 # CONFIG_VENDOR_THOMSON is not set
 # CONFIG_VENDOR_TRAVERSE is not set
@@ -109,15 +101,14 @@ CONFIG_MAINBOARD_PART_NUMBER="QEMU x86 i440fx/piix4"
 CONFIG_IRQ_SLOT_COUNT=6
 CONFIG_MAINBOARD_VENDOR="Emulation"
 CONFIG_MAX_CPUS=1
-CONFIG_DRIVERS_PS2_KEYBOARD=y
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 # CONFIG_VGA_BIOS is not set
-# CONFIG_CONSOLE_POST is not set
 CONFIG_UDELAY_IO=y
 CONFIG_DCACHE_RAM_BASE=0xd0000
 CONFIG_DCACHE_RAM_SIZE=0x10000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Emulation"
 # 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_BOARD_EMULATION_QEMU_X86_I440FX=y
@@ -135,6 +126,7 @@ CONFIG_SEABIOS_PS2_TIMEOUT=0
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_MAINBOARD_VERSION="1.0"
+CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_BOARD_ROMSIZE_KB_256=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
@@ -153,12 +145,14 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
+CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
 CONFIG_RAMBASE=0x100000
 CONFIG_NUM_IPI_STARTS=2
 # CONFIG_ROMCC is not set
+# CONFIG_LATE_CBMEM_INIT is not set
 CONFIG_PC80_SYSTEM=y
 # CONFIG_HAVE_CMOS_DEFAULT is not set
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82371eb/bootblock.c"
@@ -166,24 +160,31 @@ CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
 CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
+# CONFIG_ARCH_VERSTAGE_ARM is not set
 # CONFIG_ARCH_ROMSTAGE_ARM is not set
 # CONFIG_ARCH_RAMSTAGE_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set
+# CONFIG_ARCH_VERSTAGE_ARMV4 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV4 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV4 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7 is not set
 # 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_BOOTBLOCK_ARM_V8_64 is not set
-# CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set
-# CONFIG_ARCH_RAMSTAGE_ARM_V8_64 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_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
@@ -249,6 +250,7 @@ CONFIG_MAX_PIRQ_LINKS=4
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82371EB=y
+CONFIG_SOUTH_BRIDGE_OPTIONS=y
 
 #
 # Super I/O
@@ -261,7 +263,10 @@ CONFIG_SOUTHBRIDGE_INTEL_I82371EB=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
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
@@ -271,8 +276,8 @@ CONFIG_SOUTHBRIDGE_INTEL_I82371EB=y
 # Devices
 #
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
+CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 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_MULTIPLE_VGA_ADAPTERS is not set
@@ -281,16 +286,16 @@ CONFIG_PCI=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_AGP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 # CONFIG_PCIEXP_COMMON_CLOCK is not set
 # CONFIG_PCIEXP_ASPM is not set
-CONFIG_PCI_BUS_SEGN_BITS=0
+# CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
+# CONFIG_SOFTWARE_I2C is not set
 
 #
 # Display
@@ -300,20 +305,22 @@ CONFIG_FRAMEBUFFER_KEEP_VESA_MODE=y
 #
 # Generic Drivers
 #
+# CONFIG_DRIVERS_AS3722_RTC is not set
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS=y
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_XRES=800
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_YRES=600
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-# CONFIG_I2C_TPM is not set
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
 # CONFIG_INTEL_EDID is not set
 # CONFIG_INTEL_INT15 is not set
+# CONFIG_DRIVER_INTEL_I210 is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_LPC_TPM is not set
+CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVERS_SIL_3114 is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
@@ -342,7 +349,6 @@ CONFIG_CONSOLE_SERIAL=y
 #
 # I/O mapped, 8250-compatible
 #
-CONFIG_TTYS0_BASE=0x3f8
 CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
@@ -368,6 +374,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_NO_POST is not set
 # CONFIG_CMOS_POST is not set
+# CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
@@ -386,7 +393,7 @@ CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_PIRQ_TABLE=y
-# CONFIG_PER_DEVICE_ACPI_TABLES is not set
+CONFIG_PER_DEVICE_ACPI_TABLES=y
 # CONFIG_COMMON_FADT is not set
 
 #
diff --git a/resources/libreboot/config/qemu_q35_ich9/config b/resources/libreboot/config/qemu_q35_ich9/config
index 51eb6860..32097144 100644
--- a/resources/libreboot/config/qemu_q35_ich9/config
+++ b/resources/libreboot/config/qemu_q35_ich9/config
@@ -17,8 +17,6 @@ CONFIG_COMPILER_GCC=y
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
-# CONFIG_BROKEN_CAR_MIGRATE is not set
-CONFIG_DYNAMIC_CBMEM=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
@@ -35,18 +33,15 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_ABIT is not set
 # CONFIG_VENDOR_ADLINK is not set
 # CONFIG_VENDOR_ADVANSUS is not set
-# CONFIG_VENDOR_ADVANTECH is not set
 # CONFIG_VENDOR_AMD is not set
 # CONFIG_VENDOR_AOPEN is not set
 # CONFIG_VENDOR_APPLE is not set
 # CONFIG_VENDOR_ARIMA is not set
 # CONFIG_VENDOR_ARTECGROUP is not set
-# CONFIG_VENDOR_ASI is not set
 # CONFIG_VENDOR_ASROCK is not set
 # CONFIG_VENDOR_ASUS is not set
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AVALUE is not set
-# CONFIG_VENDOR_AXUS is not set
 # CONFIG_VENDOR_AZZA is not set
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BCOM is not set
@@ -57,7 +52,6 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
-# CONFIG_VENDOR_EAGLELION is not set
 # CONFIG_VENDOR_ECS is not set
 CONFIG_VENDOR_EMULATION=y
 # CONFIG_VENDOR_GETAC is not set
@@ -93,8 +87,6 @@ CONFIG_VENDOR_EMULATION=y
 # CONFIG_VENDOR_SUNW is not set
 # CONFIG_VENDOR_SUPERMICRO is not set
 # CONFIG_VENDOR_TECHNEXION is not set
-# CONFIG_VENDOR_TECHNOLOGIC is not set
-# CONFIG_VENDOR_TELEVIDEO is not set
 # CONFIG_VENDOR_TI is not set
 # CONFIG_VENDOR_THOMSON is not set
 # CONFIG_VENDOR_TRAVERSE is not set
@@ -107,16 +99,15 @@ CONFIG_MAINBOARD_DIR="emulation/qemu-q35"
 CONFIG_MAINBOARD_PART_NUMBER="QEMU x86 q35/ich9"
 CONFIG_MAINBOARD_VENDOR="Emulation"
 CONFIG_MAX_CPUS=1
-CONFIG_DRIVERS_PS2_KEYBOARD=y
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 # CONFIG_VGA_BIOS is not set
-# CONFIG_CONSOLE_POST is not set
 CONFIG_UDELAY_IO=y
 CONFIG_DCACHE_RAM_BASE=0xd0000
 CONFIG_DCACHE_RAM_SIZE=0x10000
 CONFIG_MMCONF_BASE_ADDRESS=0xb0000000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Emulation"
 # 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_BOARD_EMULATION_QEMU_X86_I440FX is not set
@@ -136,6 +127,7 @@ CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 CONFIG_MAINBOARD_VERSION="1.0"
+CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_BOARD_ROMSIZE_KB_256=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
@@ -154,36 +146,45 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
+CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
 CONFIG_RAMBASE=0x100000
 CONFIG_NUM_IPI_STARTS=2
 # CONFIG_ROMCC is not set
+# CONFIG_LATE_CBMEM_INIT is not set
 CONFIG_PC80_SYSTEM=y
 # CONFIG_HAVE_CMOS_DEFAULT is not set
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
 CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS=y
 CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
+# CONFIG_ARCH_VERSTAGE_ARM is not set
 # CONFIG_ARCH_ROMSTAGE_ARM is not set
 # CONFIG_ARCH_RAMSTAGE_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set
+# CONFIG_ARCH_VERSTAGE_ARMV4 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV4 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV4 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7 is not set
 # 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_BOOTBLOCK_ARM_V8_64 is not set
-# CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set
-# CONFIG_ARCH_RAMSTAGE_ARM_V8_64 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_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
@@ -264,7 +265,10 @@ CONFIG_SOUTHBRIDGE_INTEL_I82801IX=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
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
@@ -274,8 +278,8 @@ CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 # Devices
 #
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
+CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 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_MULTIPLE_VGA_ADAPTERS is not set
@@ -284,16 +288,16 @@ CONFIG_PCI=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_AGP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 # CONFIG_PCIEXP_COMMON_CLOCK is not set
 # CONFIG_PCIEXP_ASPM is not set
-CONFIG_PCI_BUS_SEGN_BITS=0
+# CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
+# CONFIG_SOFTWARE_I2C is not set
 
 #
 # Display
@@ -303,20 +307,22 @@ CONFIG_FRAMEBUFFER_KEEP_VESA_MODE=y
 #
 # Generic Drivers
 #
+# CONFIG_DRIVERS_AS3722_RTC is not set
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS=y
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_XRES=800
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_YRES=600
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-# CONFIG_I2C_TPM is not set
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
 # CONFIG_INTEL_EDID is not set
 # CONFIG_INTEL_INT15 is not set
+# CONFIG_DRIVER_INTEL_I210 is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_LPC_TPM is not set
+CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVERS_SIL_3114 is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
@@ -345,7 +351,6 @@ CONFIG_CONSOLE_SERIAL=y
 #
 # I/O mapped, 8250-compatible
 #
-CONFIG_TTYS0_BASE=0x3f8
 CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
@@ -371,6 +376,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_NO_POST is not set
 # CONFIG_CMOS_POST is not set
+# CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
@@ -388,7 +394,7 @@ CONFIG_USE_WATCHDOG_ON_BOOT=y
 CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
-# CONFIG_PER_DEVICE_ACPI_TABLES is not set
+CONFIG_PER_DEVICE_ACPI_TABLES=y
 # CONFIG_COMMON_FADT is not set
 
 #
diff --git a/resources/libreboot/config/r400_4mb/config b/resources/libreboot/config/r400_4mb/config
index bc74785f..cac73081 100644
--- a/resources/libreboot/config/r400_4mb/config
+++ b/resources/libreboot/config/r400_4mb/config
@@ -18,8 +18,6 @@ CONFIG_COMPILER_GCC=y
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
-# CONFIG_BROKEN_CAR_MIGRATE is not set
-CONFIG_DYNAMIC_CBMEM=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
@@ -36,18 +34,15 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_ABIT is not set
 # CONFIG_VENDOR_ADLINK is not set
 # CONFIG_VENDOR_ADVANSUS is not set
-# CONFIG_VENDOR_ADVANTECH is not set
 # CONFIG_VENDOR_AMD is not set
 # CONFIG_VENDOR_AOPEN is not set
 # CONFIG_VENDOR_APPLE is not set
 # CONFIG_VENDOR_ARIMA is not set
 # CONFIG_VENDOR_ARTECGROUP is not set
-# CONFIG_VENDOR_ASI is not set
 # CONFIG_VENDOR_ASROCK is not set
 # CONFIG_VENDOR_ASUS is not set
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AVALUE is not set
-# CONFIG_VENDOR_AXUS is not set
 # CONFIG_VENDOR_AZZA is not set
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BCOM is not set
@@ -58,7 +53,6 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
-# CONFIG_VENDOR_EAGLELION is not set
 # CONFIG_VENDOR_ECS is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_GETAC is not set
@@ -94,8 +88,6 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_SUNW is not set
 # CONFIG_VENDOR_SUPERMICRO is not set
 # CONFIG_VENDOR_TECHNEXION is not set
-# CONFIG_VENDOR_TECHNOLOGIC is not set
-# CONFIG_VENDOR_TELEVIDEO is not set
 # CONFIG_VENDOR_TI is not set
 # CONFIG_VENDOR_THOMSON is not set
 # CONFIG_VENDOR_TRAVERSE is not set
@@ -109,16 +101,15 @@ CONFIG_MAINBOARD_PART_NUMBER="ThinkPad R400"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
 CONFIG_VGA_BIOS_ID="8086,2a42"
-CONFIG_DRIVERS_PS2_KEYBOARD=y
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 # CONFIG_VGA_BIOS is not set
-# CONFIG_CONSOLE_POST is not set
 CONFIG_UDELAY_IO=y
 CONFIG_DCACHE_RAM_BASE=0xffaf8000
 CONFIG_DCACHE_RAM_SIZE=0x8000
 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
@@ -133,6 +124,8 @@ CONFIG_POST_DEVICE=y
 # CONFIG_BOARD_LENOVO_X201 is not set
 # CONFIG_BOARD_LENOVO_X220 is not set
 # CONFIG_BOARD_LENOVO_X230 is not set
+# CONFIG_BOARD_LENOVO_T420S is not set
+# CONFIG_BOARD_LENOVO_T430S is not set
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
@@ -143,6 +136,7 @@ CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_USBDEBUG=y
 CONFIG_MAINBOARD_VERSION="1.0"
+CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_IOMMU=y
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -162,6 +156,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
+CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_AP_IN_SIPI_WAIT is not set
@@ -169,6 +164,7 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 CONFIG_RAMBASE=0x100000
 CONFIG_NUM_IPI_STARTS=2
 # CONFIG_ROMCC is not set
+# CONFIG_LATE_CBMEM_INIT is not set
 CONFIG_PC80_SYSTEM=y
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
 CONFIG_HAVE_CMOS_DEFAULT=y
@@ -178,24 +174,31 @@ CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
 CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
+# CONFIG_ARCH_VERSTAGE_ARM is not set
 # CONFIG_ARCH_ROMSTAGE_ARM is not set
 # CONFIG_ARCH_RAMSTAGE_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set
+# CONFIG_ARCH_VERSTAGE_ARMV4 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV4 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV4 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7 is not set
 # 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_BOOTBLOCK_ARM_V8_64 is not set
-# CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set
-# CONFIG_ARCH_RAMSTAGE_ARM_V8_64 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_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
@@ -284,7 +287,10 @@ 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
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
@@ -294,8 +300,8 @@ CONFIG_EC_LENOVO_PMH7=y
 # Devices
 #
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
+CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 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_MULTIPLE_VGA_ADAPTERS is not set
@@ -304,16 +310,16 @@ CONFIG_PCI=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_AGP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 # CONFIG_PCIEXP_COMMON_CLOCK is not set
 # CONFIG_PCIEXP_ASPM is not set
-CONFIG_PCI_BUS_SEGN_BITS=0
+# CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
+# CONFIG_SOFTWARE_I2C is not set
 
 #
 # Display
@@ -323,25 +329,27 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 #
 # Generic Drivers
 #
+# CONFIG_DRIVERS_AS3722_RTC is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-# CONFIG_I2C_TPM is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
+# CONFIG_DRIVER_INTEL_I210 is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_LPC_TPM is not set
+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_NO_UART_ON_SUPERIO is not set
+CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_HAVE_UART_SPECIAL is not set
 # CONFIG_DRIVERS_UART_OXPCIE is not set
@@ -370,7 +378,6 @@ CONFIG_CONSOLE_SERIAL=y
 #
 # I/O mapped, 8250-compatible
 #
-CONFIG_TTYS0_BASE=0x3f8
 CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
@@ -395,6 +402,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_NO_POST is not set
 # CONFIG_CMOS_POST is not set
+# CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
diff --git a/resources/libreboot/config/r400_8mb/config b/resources/libreboot/config/r400_8mb/config
index b37593cd..368829ca 100644
--- a/resources/libreboot/config/r400_8mb/config
+++ b/resources/libreboot/config/r400_8mb/config
@@ -18,8 +18,6 @@ CONFIG_COMPILER_GCC=y
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
-# CONFIG_BROKEN_CAR_MIGRATE is not set
-CONFIG_DYNAMIC_CBMEM=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
@@ -36,18 +34,15 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_ABIT is not set
 # CONFIG_VENDOR_ADLINK is not set
 # CONFIG_VENDOR_ADVANSUS is not set
-# CONFIG_VENDOR_ADVANTECH is not set
 # CONFIG_VENDOR_AMD is not set
 # CONFIG_VENDOR_AOPEN is not set
 # CONFIG_VENDOR_APPLE is not set
 # CONFIG_VENDOR_ARIMA is not set
 # CONFIG_VENDOR_ARTECGROUP is not set
-# CONFIG_VENDOR_ASI is not set
 # CONFIG_VENDOR_ASROCK is not set
 # CONFIG_VENDOR_ASUS is not set
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AVALUE is not set
-# CONFIG_VENDOR_AXUS is not set
 # CONFIG_VENDOR_AZZA is not set
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BCOM is not set
@@ -58,7 +53,6 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
-# CONFIG_VENDOR_EAGLELION is not set
 # CONFIG_VENDOR_ECS is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_GETAC is not set
@@ -94,8 +88,6 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_SUNW is not set
 # CONFIG_VENDOR_SUPERMICRO is not set
 # CONFIG_VENDOR_TECHNEXION is not set
-# CONFIG_VENDOR_TECHNOLOGIC is not set
-# CONFIG_VENDOR_TELEVIDEO is not set
 # CONFIG_VENDOR_TI is not set
 # CONFIG_VENDOR_THOMSON is not set
 # CONFIG_VENDOR_TRAVERSE is not set
@@ -109,16 +101,15 @@ CONFIG_MAINBOARD_PART_NUMBER="ThinkPad R400"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
 CONFIG_VGA_BIOS_ID="8086,2a42"
-CONFIG_DRIVERS_PS2_KEYBOARD=y
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 # CONFIG_VGA_BIOS is not set
-# CONFIG_CONSOLE_POST is not set
 CONFIG_UDELAY_IO=y
 CONFIG_DCACHE_RAM_BASE=0xffaf8000
 CONFIG_DCACHE_RAM_SIZE=0x8000
 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
@@ -133,6 +124,8 @@ CONFIG_POST_DEVICE=y
 # CONFIG_BOARD_LENOVO_X201 is not set
 # CONFIG_BOARD_LENOVO_X220 is not set
 # CONFIG_BOARD_LENOVO_X230 is not set
+# CONFIG_BOARD_LENOVO_T420S is not set
+# CONFIG_BOARD_LENOVO_T430S is not set
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
@@ -143,6 +136,7 @@ CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_USBDEBUG=y
 CONFIG_MAINBOARD_VERSION="1.0"
+CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_IOMMU=y
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -162,6 +156,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
+CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_AP_IN_SIPI_WAIT is not set
@@ -169,6 +164,7 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 CONFIG_RAMBASE=0x100000
 CONFIG_NUM_IPI_STARTS=2
 # CONFIG_ROMCC is not set
+# CONFIG_LATE_CBMEM_INIT is not set
 CONFIG_PC80_SYSTEM=y
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
 CONFIG_HAVE_CMOS_DEFAULT=y
@@ -178,24 +174,31 @@ CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
 CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
+# CONFIG_ARCH_VERSTAGE_ARM is not set
 # CONFIG_ARCH_ROMSTAGE_ARM is not set
 # CONFIG_ARCH_RAMSTAGE_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set
+# CONFIG_ARCH_VERSTAGE_ARMV4 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV4 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV4 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7 is not set
 # 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_BOOTBLOCK_ARM_V8_64 is not set
-# CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set
-# CONFIG_ARCH_RAMSTAGE_ARM_V8_64 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_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
@@ -284,7 +287,10 @@ 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
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
@@ -294,8 +300,8 @@ CONFIG_EC_LENOVO_PMH7=y
 # Devices
 #
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
+CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 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_MULTIPLE_VGA_ADAPTERS is not set
@@ -304,16 +310,16 @@ CONFIG_PCI=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_AGP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 # CONFIG_PCIEXP_COMMON_CLOCK is not set
 # CONFIG_PCIEXP_ASPM is not set
-CONFIG_PCI_BUS_SEGN_BITS=0
+# CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
+# CONFIG_SOFTWARE_I2C is not set
 
 #
 # Display
@@ -323,25 +329,27 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 #
 # Generic Drivers
 #
+# CONFIG_DRIVERS_AS3722_RTC is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-# CONFIG_I2C_TPM is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
+# CONFIG_DRIVER_INTEL_I210 is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_LPC_TPM is not set
+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_NO_UART_ON_SUPERIO is not set
+CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_HAVE_UART_SPECIAL is not set
 # CONFIG_DRIVERS_UART_OXPCIE is not set
@@ -370,7 +378,6 @@ CONFIG_CONSOLE_SERIAL=y
 #
 # I/O mapped, 8250-compatible
 #
-CONFIG_TTYS0_BASE=0x3f8
 CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
@@ -395,6 +402,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_NO_POST is not set
 # CONFIG_CMOS_POST is not set
+# CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
diff --git a/resources/libreboot/config/t60/config b/resources/libreboot/config/t60/config
index a7dce380..4e558f7b 100644
--- a/resources/libreboot/config/t60/config
+++ b/resources/libreboot/config/t60/config
@@ -18,8 +18,6 @@ CONFIG_COMPILER_GCC=y
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
-# CONFIG_BROKEN_CAR_MIGRATE is not set
-CONFIG_DYNAMIC_CBMEM=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
@@ -36,18 +34,15 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_ABIT is not set
 # CONFIG_VENDOR_ADLINK is not set
 # CONFIG_VENDOR_ADVANSUS is not set
-# CONFIG_VENDOR_ADVANTECH is not set
 # CONFIG_VENDOR_AMD is not set
 # CONFIG_VENDOR_AOPEN is not set
 # CONFIG_VENDOR_APPLE is not set
 # CONFIG_VENDOR_ARIMA is not set
 # CONFIG_VENDOR_ARTECGROUP is not set
-# CONFIG_VENDOR_ASI is not set
 # CONFIG_VENDOR_ASROCK is not set
 # CONFIG_VENDOR_ASUS is not set
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AVALUE is not set
-# CONFIG_VENDOR_AXUS is not set
 # CONFIG_VENDOR_AZZA is not set
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BCOM is not set
@@ -58,7 +53,6 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
-# CONFIG_VENDOR_EAGLELION is not set
 # CONFIG_VENDOR_ECS is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_GETAC is not set
@@ -94,8 +88,6 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_SUNW is not set
 # CONFIG_VENDOR_SUPERMICRO is not set
 # CONFIG_VENDOR_TECHNEXION is not set
-# CONFIG_VENDOR_TECHNOLOGIC is not set
-# CONFIG_VENDOR_TELEVIDEO is not set
 # CONFIG_VENDOR_TI is not set
 # CONFIG_VENDOR_THOMSON is not set
 # CONFIG_VENDOR_TRAVERSE is not set
@@ -109,16 +101,15 @@ CONFIG_MAINBOARD_PART_NUMBER="ThinkPad T60"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
 CONFIG_VGA_BIOS_ID="8086,27a2"
-CONFIG_DRIVERS_PS2_KEYBOARD=y
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 # CONFIG_VGA_BIOS is not set
-# CONFIG_CONSOLE_POST is not set
 # CONFIG_UDELAY_IO is not set
 CONFIG_DCACHE_RAM_BASE=0xffdf8000
 CONFIG_DCACHE_RAM_SIZE=0x8000
 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
@@ -133,6 +124,8 @@ CONFIG_POST_DEVICE=y
 # CONFIG_BOARD_LENOVO_X201 is not set
 # CONFIG_BOARD_LENOVO_X220 is not set
 # CONFIG_BOARD_LENOVO_X230 is not set
+# CONFIG_BOARD_LENOVO_T420S is not set
+# CONFIG_BOARD_LENOVO_T430S is not set
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 CONFIG_BOARD_LENOVO_T60=y
@@ -143,6 +136,7 @@ CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_USBDEBUG=y
 CONFIG_MAINBOARD_VERSION="ThinkPad T60"
+CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
 CONFIG_BOARD_ROMSIZE_KB_2048=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -162,6 +156,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
+CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
 CONFIG_AP_IN_SIPI_WAIT=y
@@ -169,6 +164,7 @@ CONFIG_AP_IN_SIPI_WAIT=y
 CONFIG_RAMBASE=0x100000
 CONFIG_NUM_IPI_STARTS=2
 # CONFIG_ROMCC is not set
+# CONFIG_LATE_CBMEM_INIT is not set
 CONFIG_PC80_SYSTEM=y
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/i945/bootblock.c"
 CONFIG_HAVE_CMOS_DEFAULT=y
@@ -178,24 +174,31 @@ CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
 CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
+# CONFIG_ARCH_VERSTAGE_ARM is not set
 # CONFIG_ARCH_ROMSTAGE_ARM is not set
 # CONFIG_ARCH_RAMSTAGE_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set
+# CONFIG_ARCH_VERSTAGE_ARMV4 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV4 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV4 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7 is not set
 # 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_BOOTBLOCK_ARM_V8_64 is not set
-# CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set
-# CONFIG_ARCH_RAMSTAGE_ARM_V8_64 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_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
@@ -296,7 +299,10 @@ 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
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
@@ -306,8 +312,8 @@ CONFIG_EC_LENOVO_PMH7=y
 # Devices
 #
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
+CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 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_MULTIPLE_VGA_ADAPTERS is not set
@@ -316,16 +322,16 @@ CONFIG_PCI=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_AGP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 # CONFIG_PCIEXP_COMMON_CLOCK is not set
 # CONFIG_PCIEXP_ASPM is not set
-CONFIG_PCI_BUS_SEGN_BITS=0
+# CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
+# CONFIG_SOFTWARE_I2C is not set
 
 #
 # Display
@@ -335,18 +341,20 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 #
 # Generic Drivers
 #
+# CONFIG_DRIVERS_AS3722_RTC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-# CONFIG_I2C_TPM is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
+# CONFIG_DRIVER_INTEL_I210 is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_LPC_TPM is not set
+CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVERS_SIL_3114 is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
@@ -381,7 +389,6 @@ CONFIG_CONSOLE_SERIAL=y
 #
 # I/O mapped, 8250-compatible
 #
-CONFIG_TTYS0_BASE=0x3f8
 CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
@@ -406,6 +413,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_NO_POST is not set
 # CONFIG_CMOS_POST is not set
+# CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
diff --git a/resources/libreboot/config/x200_4mb/config b/resources/libreboot/config/x200_4mb/config
index 2a01d69c..58ccea2a 100644
--- a/resources/libreboot/config/x200_4mb/config
+++ b/resources/libreboot/config/x200_4mb/config
@@ -18,8 +18,6 @@ CONFIG_COMPILER_GCC=y
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
-# CONFIG_BROKEN_CAR_MIGRATE is not set
-CONFIG_DYNAMIC_CBMEM=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
@@ -36,18 +34,15 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_ABIT is not set
 # CONFIG_VENDOR_ADLINK is not set
 # CONFIG_VENDOR_ADVANSUS is not set
-# CONFIG_VENDOR_ADVANTECH is not set
 # CONFIG_VENDOR_AMD is not set
 # CONFIG_VENDOR_AOPEN is not set
 # CONFIG_VENDOR_APPLE is not set
 # CONFIG_VENDOR_ARIMA is not set
 # CONFIG_VENDOR_ARTECGROUP is not set
-# CONFIG_VENDOR_ASI is not set
 # CONFIG_VENDOR_ASROCK is not set
 # CONFIG_VENDOR_ASUS is not set
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AVALUE is not set
-# CONFIG_VENDOR_AXUS is not set
 # CONFIG_VENDOR_AZZA is not set
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BCOM is not set
@@ -58,7 +53,6 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
-# CONFIG_VENDOR_EAGLELION is not set
 # CONFIG_VENDOR_ECS is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_GETAC is not set
@@ -94,8 +88,6 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_SUNW is not set
 # CONFIG_VENDOR_SUPERMICRO is not set
 # CONFIG_VENDOR_TECHNEXION is not set
-# CONFIG_VENDOR_TECHNOLOGIC is not set
-# CONFIG_VENDOR_TELEVIDEO is not set
 # CONFIG_VENDOR_TI is not set
 # CONFIG_VENDOR_THOMSON is not set
 # CONFIG_VENDOR_TRAVERSE is not set
@@ -109,16 +101,15 @@ CONFIG_MAINBOARD_PART_NUMBER="ThinkPad X200"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
 CONFIG_VGA_BIOS_ID="8086,2a42"
-CONFIG_DRIVERS_PS2_KEYBOARD=y
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 # CONFIG_VGA_BIOS is not set
-# CONFIG_CONSOLE_POST is not set
 CONFIG_UDELAY_IO=y
 CONFIG_DCACHE_RAM_BASE=0xffaf8000
 CONFIG_DCACHE_RAM_SIZE=0x8000
 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
@@ -133,6 +124,8 @@ CONFIG_BOARD_LENOVO_X200=y
 # CONFIG_BOARD_LENOVO_X201 is not set
 # CONFIG_BOARD_LENOVO_X220 is not set
 # CONFIG_BOARD_LENOVO_X230 is not set
+# CONFIG_BOARD_LENOVO_T420S is not set
+# CONFIG_BOARD_LENOVO_T430S is not set
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
@@ -143,6 +136,7 @@ CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_USBDEBUG=y
 CONFIG_MAINBOARD_VERSION="1.0"
+CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_IOMMU=y
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -162,6 +156,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
+CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_AP_IN_SIPI_WAIT is not set
@@ -169,6 +164,7 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 CONFIG_RAMBASE=0x100000
 CONFIG_NUM_IPI_STARTS=2
 # CONFIG_ROMCC is not set
+# CONFIG_LATE_CBMEM_INIT is not set
 CONFIG_PC80_SYSTEM=y
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
 CONFIG_HAVE_CMOS_DEFAULT=y
@@ -178,24 +174,31 @@ CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
 CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
+# CONFIG_ARCH_VERSTAGE_ARM is not set
 # CONFIG_ARCH_ROMSTAGE_ARM is not set
 # CONFIG_ARCH_RAMSTAGE_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set
+# CONFIG_ARCH_VERSTAGE_ARMV4 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV4 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV4 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7 is not set
 # 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_BOOTBLOCK_ARM_V8_64 is not set
-# CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set
-# CONFIG_ARCH_RAMSTAGE_ARM_V8_64 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_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
@@ -284,7 +287,10 @@ 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
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
@@ -294,8 +300,8 @@ CONFIG_EC_LENOVO_PMH7=y
 # Devices
 #
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
+CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 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_MULTIPLE_VGA_ADAPTERS is not set
@@ -304,16 +310,16 @@ CONFIG_PCI=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_AGP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 # CONFIG_PCIEXP_COMMON_CLOCK is not set
 # CONFIG_PCIEXP_ASPM is not set
-CONFIG_PCI_BUS_SEGN_BITS=0
+# CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
+# CONFIG_SOFTWARE_I2C is not set
 
 #
 # Display
@@ -323,25 +329,27 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 #
 # Generic Drivers
 #
+# CONFIG_DRIVERS_AS3722_RTC is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-# CONFIG_I2C_TPM is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
+# CONFIG_DRIVER_INTEL_I210 is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_LPC_TPM is not set
+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_NO_UART_ON_SUPERIO is not set
+CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_HAVE_UART_SPECIAL is not set
 # CONFIG_DRIVERS_UART_OXPCIE is not set
@@ -370,7 +378,6 @@ CONFIG_CONSOLE_SERIAL=y
 #
 # I/O mapped, 8250-compatible
 #
-CONFIG_TTYS0_BASE=0x3f8
 CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
@@ -395,6 +402,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_NO_POST is not set
 # CONFIG_CMOS_POST is not set
+# CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
diff --git a/resources/libreboot/config/x200_8mb/config b/resources/libreboot/config/x200_8mb/config
index d15667ed..b2c342b6 100644
--- a/resources/libreboot/config/x200_8mb/config
+++ b/resources/libreboot/config/x200_8mb/config
@@ -18,8 +18,6 @@ CONFIG_COMPILER_GCC=y
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
-# CONFIG_BROKEN_CAR_MIGRATE is not set
-CONFIG_DYNAMIC_CBMEM=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
@@ -36,18 +34,15 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_ABIT is not set
 # CONFIG_VENDOR_ADLINK is not set
 # CONFIG_VENDOR_ADVANSUS is not set
-# CONFIG_VENDOR_ADVANTECH is not set
 # CONFIG_VENDOR_AMD is not set
 # CONFIG_VENDOR_AOPEN is not set
 # CONFIG_VENDOR_APPLE is not set
 # CONFIG_VENDOR_ARIMA is not set
 # CONFIG_VENDOR_ARTECGROUP is not set
-# CONFIG_VENDOR_ASI is not set
 # CONFIG_VENDOR_ASROCK is not set
 # CONFIG_VENDOR_ASUS is not set
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AVALUE is not set
-# CONFIG_VENDOR_AXUS is not set
 # CONFIG_VENDOR_AZZA is not set
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BCOM is not set
@@ -58,7 +53,6 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
-# CONFIG_VENDOR_EAGLELION is not set
 # CONFIG_VENDOR_ECS is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_GETAC is not set
@@ -94,8 +88,6 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_SUNW is not set
 # CONFIG_VENDOR_SUPERMICRO is not set
 # CONFIG_VENDOR_TECHNEXION is not set
-# CONFIG_VENDOR_TECHNOLOGIC is not set
-# CONFIG_VENDOR_TELEVIDEO is not set
 # CONFIG_VENDOR_TI is not set
 # CONFIG_VENDOR_THOMSON is not set
 # CONFIG_VENDOR_TRAVERSE is not set
@@ -109,16 +101,15 @@ CONFIG_MAINBOARD_PART_NUMBER="ThinkPad X200"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
 CONFIG_VGA_BIOS_ID="8086,2a42"
-CONFIG_DRIVERS_PS2_KEYBOARD=y
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 # CONFIG_VGA_BIOS is not set
-# CONFIG_CONSOLE_POST is not set
 CONFIG_UDELAY_IO=y
 CONFIG_DCACHE_RAM_BASE=0xffaf8000
 CONFIG_DCACHE_RAM_SIZE=0x8000
 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
@@ -133,6 +124,8 @@ CONFIG_BOARD_LENOVO_X200=y
 # CONFIG_BOARD_LENOVO_X201 is not set
 # CONFIG_BOARD_LENOVO_X220 is not set
 # CONFIG_BOARD_LENOVO_X230 is not set
+# CONFIG_BOARD_LENOVO_T420S is not set
+# CONFIG_BOARD_LENOVO_T430S is not set
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
@@ -143,6 +136,7 @@ CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_USBDEBUG=y
 CONFIG_MAINBOARD_VERSION="1.0"
+CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_IOMMU=y
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -162,6 +156,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
+CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_AP_IN_SIPI_WAIT is not set
@@ -169,6 +164,7 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 CONFIG_RAMBASE=0x100000
 CONFIG_NUM_IPI_STARTS=2
 # CONFIG_ROMCC is not set
+# CONFIG_LATE_CBMEM_INIT is not set
 CONFIG_PC80_SYSTEM=y
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/gm45/bootblock.c"
 CONFIG_HAVE_CMOS_DEFAULT=y
@@ -178,24 +174,31 @@ CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
 CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
+# CONFIG_ARCH_VERSTAGE_ARM is not set
 # CONFIG_ARCH_ROMSTAGE_ARM is not set
 # CONFIG_ARCH_RAMSTAGE_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set
+# CONFIG_ARCH_VERSTAGE_ARMV4 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV4 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV4 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7 is not set
 # 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_BOOTBLOCK_ARM_V8_64 is not set
-# CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set
-# CONFIG_ARCH_RAMSTAGE_ARM_V8_64 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_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
@@ -284,7 +287,10 @@ 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
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
@@ -294,8 +300,8 @@ CONFIG_EC_LENOVO_PMH7=y
 # Devices
 #
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
+CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 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_MULTIPLE_VGA_ADAPTERS is not set
@@ -304,16 +310,16 @@ CONFIG_PCI=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_AGP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 # CONFIG_PCIEXP_COMMON_CLOCK is not set
 # CONFIG_PCIEXP_ASPM is not set
-CONFIG_PCI_BUS_SEGN_BITS=0
+# CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
+# CONFIG_SOFTWARE_I2C is not set
 
 #
 # Display
@@ -323,25 +329,27 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 #
 # Generic Drivers
 #
+# CONFIG_DRIVERS_AS3722_RTC is not set
 CONFIG_DRIVERS_GENERIC_IOAPIC=y
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-# CONFIG_I2C_TPM is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
+# CONFIG_DRIVER_INTEL_I210 is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_LPC_TPM is not set
+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_NO_UART_ON_SUPERIO is not set
+CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_HAVE_UART_SPECIAL is not set
 # CONFIG_DRIVERS_UART_OXPCIE is not set
@@ -370,7 +378,6 @@ CONFIG_CONSOLE_SERIAL=y
 #
 # I/O mapped, 8250-compatible
 #
-CONFIG_TTYS0_BASE=0x3f8
 CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
@@ -395,6 +402,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_NO_POST is not set
 # CONFIG_CMOS_POST is not set
+# CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
diff --git a/resources/libreboot/config/x60/config b/resources/libreboot/config/x60/config
index bc6c5e47..745068e9 100644
--- a/resources/libreboot/config/x60/config
+++ b/resources/libreboot/config/x60/config
@@ -15,11 +15,10 @@ 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_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
-# CONFIG_BROKEN_CAR_MIGRATE is not set
-CONFIG_DYNAMIC_CBMEM=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
@@ -36,18 +35,15 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_ABIT is not set
 # CONFIG_VENDOR_ADLINK is not set
 # CONFIG_VENDOR_ADVANSUS is not set
-# CONFIG_VENDOR_ADVANTECH is not set
 # CONFIG_VENDOR_AMD is not set
 # CONFIG_VENDOR_AOPEN is not set
 # CONFIG_VENDOR_APPLE is not set
 # CONFIG_VENDOR_ARIMA is not set
 # CONFIG_VENDOR_ARTECGROUP is not set
-# CONFIG_VENDOR_ASI is not set
 # CONFIG_VENDOR_ASROCK is not set
 # CONFIG_VENDOR_ASUS is not set
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AVALUE is not set
-# CONFIG_VENDOR_AXUS is not set
 # CONFIG_VENDOR_AZZA is not set
 # CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BCOM is not set
@@ -58,7 +54,6 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_CUBIETECH is not set
 # CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_DMP is not set
-# CONFIG_VENDOR_EAGLELION is not set
 # CONFIG_VENDOR_ECS is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_GETAC is not set
@@ -94,8 +89,6 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_SUNW is not set
 # CONFIG_VENDOR_SUPERMICRO is not set
 # CONFIG_VENDOR_TECHNEXION is not set
-# CONFIG_VENDOR_TECHNOLOGIC is not set
-# CONFIG_VENDOR_TELEVIDEO is not set
 # CONFIG_VENDOR_TI is not set
 # CONFIG_VENDOR_THOMSON is not set
 # CONFIG_VENDOR_TRAVERSE is not set
@@ -110,16 +103,15 @@ CONFIG_IRQ_SLOT_COUNT=18
 CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
 CONFIG_VGA_BIOS_ID="8086,27a2"
-CONFIG_DRIVERS_PS2_KEYBOARD=y
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 # CONFIG_VGA_BIOS is not set
-# CONFIG_CONSOLE_POST is not set
 # CONFIG_UDELAY_IO is not set
 CONFIG_DCACHE_RAM_BASE=0xffdf8000
 CONFIG_DCACHE_RAM_SIZE=0x8000
 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
@@ -134,6 +126,8 @@ CONFIG_BOARD_LENOVO_X60=y
 # CONFIG_BOARD_LENOVO_X201 is not set
 # CONFIG_BOARD_LENOVO_X220 is not set
 # CONFIG_BOARD_LENOVO_X230 is not set
+# CONFIG_BOARD_LENOVO_T420S is not set
+# CONFIG_BOARD_LENOVO_T430S is not set
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
@@ -144,6 +138,7 @@ CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_USBDEBUG=y
 CONFIG_MAINBOARD_VERSION="1.0"
+CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
 CONFIG_BOARD_ROMSIZE_KB_2048=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -163,6 +158,7 @@ CONFIG_ARCH_X86=y
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_RISCV is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
+CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
 CONFIG_AP_IN_SIPI_WAIT=y
@@ -170,6 +166,7 @@ CONFIG_AP_IN_SIPI_WAIT=y
 CONFIG_RAMBASE=0x100000
 CONFIG_NUM_IPI_STARTS=2
 # CONFIG_ROMCC is not set
+# CONFIG_LATE_CBMEM_INIT is not set
 CONFIG_PC80_SYSTEM=y
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/i945/bootblock.c"
 CONFIG_HAVE_CMOS_DEFAULT=y
@@ -179,24 +176,31 @@ CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
 CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
+# CONFIG_ARCH_VERSTAGE_ARM is not set
 # CONFIG_ARCH_ROMSTAGE_ARM is not set
 # CONFIG_ARCH_RAMSTAGE_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set
+# CONFIG_ARCH_VERSTAGE_ARMV4 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV4 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV4 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set
+# CONFIG_ARCH_VERSTAGE_ARMV7 is not set
 # 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_BOOTBLOCK_ARM_V8_64 is not set
-# CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set
-# CONFIG_ARCH_RAMSTAGE_ARM_V8_64 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_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
@@ -297,7 +301,10 @@ 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
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
@@ -307,8 +314,8 @@ CONFIG_EC_LENOVO_PMH7=y
 # Devices
 #
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
+CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 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_MULTIPLE_VGA_ADAPTERS is not set
@@ -317,16 +324,16 @@ CONFIG_PCI=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_AGP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 # CONFIG_PCIEXP_COMMON_CLOCK is not set
 # CONFIG_PCIEXP_ASPM is not set
-CONFIG_PCI_BUS_SEGN_BITS=0
+# CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_EARLY_PCI_BRIDGE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
+# CONFIG_SOFTWARE_I2C is not set
 
 #
 # Display
@@ -336,13 +343,14 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 #
 # Generic Drivers
 #
+# CONFIG_DRIVERS_AS3722_RTC is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
-# CONFIG_I2C_TPM is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
+# CONFIG_DRIVER_INTEL_I210 is not set
 # CONFIG_IPMI_KCS is not set
 CONFIG_DRIVERS_LENOVO_WACOM=y
 # CONFIG_DIGITIZER_AUTODETECT is not set
@@ -351,6 +359,7 @@ CONFIG_DIGITIZER_PRESENT=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_LPC_TPM is not set
+CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVERS_SIL_3114 is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
@@ -385,7 +394,6 @@ CONFIG_CONSOLE_SERIAL=y
 #
 # I/O mapped, 8250-compatible
 #
-CONFIG_TTYS0_BASE=0x3f8
 CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
@@ -410,6 +418,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_NO_POST is not set
 # CONFIG_CMOS_POST is not set
+# CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
diff --git a/resources/libreboot/patch/r400.diff b/resources/libreboot/patch/r400.diff
deleted file mode 100644
index 251ad9be..00000000
--- a/resources/libreboot/patch/r400.diff
+++ /dev/null
@@ -1,105 +0,0 @@
-From 845d9d2575184b503b35fddd5f0ea95e1d592d39 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20Mas=C5=82owski?= <mtjm@mtjm.eu>
-Date: Tue, 3 Feb 2015 23:26:05 +0100
-Subject: [PATCH] lenovo/r400: new mainboard (x200 clone)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Existing X200 port works without changes on R400.  Vendor BIOS
-provides different hda_verb (since the connectors are on front, not
-right), but this doesn't provide enough benefit to justify having
-different source files.
-
-Change-Id: I1dadddd7250ab80a4c40c2435865d72e3e5d99c9
-Signed-off-by: Michał Masłowski <mtjm@mtjm.eu>
-Signed-off-by: Francis Rowe <info@gluglug.org.uk>
-
-Conflicts:
-	src/mainboard/lenovo/x200/Kconfig
----
- src/mainboard/lenovo/Kconfig             | 6 ++++++
- src/mainboard/lenovo/r400/Kconfig        | 7 +++++++
- src/mainboard/lenovo/r400/board_info.txt | 6 ++++++
- src/mainboard/lenovo/x200/Kconfig        | 6 +++++-
- 4 files changed, 24 insertions(+), 1 deletion(-)
- create mode 100644 src/mainboard/lenovo/r400/Kconfig
- create mode 100644 src/mainboard/lenovo/r400/board_info.txt
-
-diff --git a/src/mainboard/lenovo/Kconfig b/src/mainboard/lenovo/Kconfig
-index 95f7cfd..2a7fa33 100644
---- a/src/mainboard/lenovo/Kconfig
-+++ b/src/mainboard/lenovo/Kconfig
-@@ -65,6 +65,11 @@ config BOARD_LENOVO_G505S
- 	help
- 	  Lenovo G505s
- 
-+config BOARD_LENOVO_R400
-+	bool "ThinkPad R400"
-+	help
-+	  Lenovo R400 laptop. Consult wiki for details.
-+
- endchoice
- 
- source "src/mainboard/lenovo/x60/Kconfig"
-@@ -78,6 +83,7 @@ source "src/mainboard/lenovo/t520/Kconfig"
- source "src/mainboard/lenovo/t530/Kconfig"
- source "src/mainboard/lenovo/t60/Kconfig"
- source "src/mainboard/lenovo/g505s/Kconfig"
-+source "src/mainboard/lenovo/r400/Kconfig"
- 
- config MAINBOARD_VENDOR
- 	string
-diff --git a/src/mainboard/lenovo/r400/Kconfig b/src/mainboard/lenovo/r400/Kconfig
-new file mode 100644
-index 0000000..0966bf1
---- /dev/null
-+++ b/src/mainboard/lenovo/r400/Kconfig
-@@ -0,0 +1,7 @@
-+if BOARD_LENOVO_R400
-+
-+config MAINBOARD_PART_NUMBER
-+	string
-+	default "ThinkPad R400"
-+
-+endif
-diff --git a/src/mainboard/lenovo/r400/board_info.txt b/src/mainboard/lenovo/r400/board_info.txt
-new file mode 100644
-index 0000000..8791abf
---- /dev/null
-+++ b/src/mainboard/lenovo/r400/board_info.txt
-@@ -0,0 +1,6 @@
-+Category: laptop
-+ROM package: SOIC-16 or SOIC-8
-+ROM protocol: SPI
-+ROM socketed: n
-+Flashrom support: n
-+Clone of: lenovo/x200
-diff --git a/src/mainboard/lenovo/x200/Kconfig b/src/mainboard/lenovo/x200/Kconfig
-index 67fc388..51c1ad7 100644
---- a/src/mainboard/lenovo/x200/Kconfig
-+++ b/src/mainboard/lenovo/x200/Kconfig
-@@ -1,4 +1,4 @@
--if BOARD_LENOVO_X200
-+if BOARD_LENOVO_X200 || BOARD_LENOVO_R400
- 
- config BOARD_SPECIFIC_OPTIONS # dummy
- 	def_bool y
-@@ -26,10 +26,14 @@ config MAINBOARD_DIR
- 	string
- 	default lenovo/x200
- 
-+if BOARD_LENOVO_X200
-+
- config MAINBOARD_PART_NUMBER
- 	string
- 	default "ThinkPad X200"
- 
-+endif
-+
- config MMCONF_BASE_ADDRESS
- 	hex
- 	default 0xf0000000
--- 
-1.9.1
-