i945/gm45/x4x: update configs

21 files changed, 479 insertions, 347 deletions

diff --git a/resources/libreboot/config/grub/d510mo/config b/resources/libreboot/config/grub/d510mo/config
index ebe6636b..90413e93 100644
--- a/resources/libreboot/config/grub/d510mo/config
+++ b/resources/libreboot/config/grub/d510mo/config
@@ -420,14 +420,6 @@ CONFIG_MMCONF_SUPPORT=y
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
diff --git a/resources/libreboot/config/grub/ga-g41m-es2l/config b/resources/libreboot/config/grub/ga-g41m-es2l/config
index a0c7fc0c..42a43cc6 100644
--- a/resources/libreboot/config/grub/ga-g41m-es2l/config
+++ b/resources/libreboot/config/grub/ga-g41m-es2l/config
@@ -8,13 +8,13 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
 # CONFIG_CCACHE is not set
 # CONFIG_FMD_GENPARSER is not set
 # CONFIG_SCONFIG_GENPARSER is not set
+# CONFIG_USE_OPTION_TABLE is not set
 # CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
@@ -161,6 +161,7 @@ CONFIG_COREBOOT_ROMSIZE_KB_1024=y
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=1024
 CONFIG_ROM_SIZE=0x100000
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 # CONFIG_SYSTEM_TYPE_LAPTOP is not set
@@ -190,7 +191,6 @@ CONFIG_HPET_MIN_TICKS=0x80
 # CONFIG_SOC_MARVELL_BG4CD is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
@@ -237,6 +237,7 @@ CONFIG_LOGICAL_CPUS=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
@@ -282,8 +283,13 @@ CONFIG_SUPERIO_ITE_IT8718F=y
 #
 # Embedded Controllers
 #
+CONFIG_VBOOT_VBNV_OFFSET=0x26
+# CONFIG_VBOOT_VBNV_CMOS is not set
+# CONFIG_VBOOT_VBNV_EC is not set
+# CONFIG_VBOOT is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -343,7 +349,8 @@ CONFIG_SIPI_VECTOR_IN_ROM=y
 CONFIG_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
 # CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
-# CONFIG_HAVE_CMOS_DEFAULT is not set
+CONFIG_HAVE_CMOS_DEFAULT=y
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
 # CONFIG_POSTCAR_STAGE is not set
@@ -405,12 +412,14 @@ CONFIG_HAVE_USBDEBUG=y
 # CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
+# CONFIG_DRIVER_I2C_TPM_ACPI is not set
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 # CONFIG_INTEL_INT15 is not set
 CONFIG_INTEL_GMA_ACPI=y
 # CONFIG_DRIVER_INTEL_I210 is not set
+CONFIG_DRIVERS_INTEL_WIFI=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
@@ -425,26 +434,21 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_ACPI_SATA_GENERATOR is not set
 CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
 CONFIG_STACK_SIZE=0x1000
 CONFIG_MMCONF_SUPPORT_DEFAULT=y
 CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
@@ -470,7 +474,7 @@ CONFIG_HAVE_HARD_RESET=y
 # CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK is not set
 # CONFIG_HAVE_MONOTONIC_TIMER is not set
-# CONFIG_HAVE_OPTION_TABLE is not set
+CONFIG_HAVE_OPTION_TABLE=y
 # CONFIG_PIRQ_ROUTE is not set
 CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
@@ -495,6 +499,7 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="GA-G41M-ES2L"
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
diff --git a/resources/libreboot/config/grub/kcma-d8/config b/resources/libreboot/config/grub/kcma-d8/config
index ec7c745b..6dfa41e7 100644
--- a/resources/libreboot/config/grub/kcma-d8/config
+++ b/resources/libreboot/config/grub/kcma-d8/config
@@ -497,14 +497,6 @@ CONFIG_MMCONF_SUPPORT=y
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
diff --git a/resources/libreboot/config/grub/kgpe-d16/config b/resources/libreboot/config/grub/kgpe-d16/config
index 3a847cbc..e442cf72 100644
--- a/resources/libreboot/config/grub/kgpe-d16/config
+++ b/resources/libreboot/config/grub/kgpe-d16/config
@@ -497,14 +497,6 @@ CONFIG_MMCONF_SUPPORT=y
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
diff --git a/resources/libreboot/config/grub/macbook21/config b/resources/libreboot/config/grub/macbook21/config
index 84db8770..eff4ebbc 100644
--- a/resources/libreboot/config/grub/macbook21/config
+++ b/resources/libreboot/config/grub/macbook21/config
@@ -8,7 +8,6 @@
 #
 CONFIG_LOCALVERSION="    MB21.88Z.00A5.B07.0706270922"
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -19,15 +18,16 @@ CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
 # CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
-# CONFIG_COMPRESS_PRERAM_STAGES is not set
 CONFIG_INCLUDE_CONFIG_FILE=y
+# CONFIG_NO_XIP_EARLY_STAGES is not set
 CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
 # CONFIG_RELOCATABLE_MODULES is not set
 # CONFIG_RELOCATABLE_RAMSTAGE is not set
-CONFIG_FLASHMAP_OFFSET=0x0
+# CONFIG_NO_STAGE_CACHE is not set
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_CUSTOM=y
@@ -39,7 +39,6 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_BOARD_ID_MANUAL is not set
 # CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
-# CONFIG_ACPI_SATA_GENERATOR is not set
 
 #
 # Mainboard
@@ -47,6 +46,7 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ABIT is not set
+# CONFIG_VENDOR_ADI is not set
 # CONFIG_VENDOR_ADLINK is not set
 # CONFIG_VENDOR_ADVANSUS is not set
 # CONFIG_VENDOR_AMD is not set
@@ -114,10 +114,11 @@ CONFIG_MAINBOARD_DIR="apple/macbook21"
 CONFIG_MAINBOARD_PART_NUMBER="MacBook2,1"
 CONFIG_MAINBOARD_VENDOR="Apple"
 CONFIG_MAX_CPUS=2
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_CBFS_SIZE=0x200000
 CONFIG_VGA_BIOS_ID="8086,27a2"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 # CONFIG_VGA_BIOS is not set
-# CONFIG_UDELAY_IO is not set
 CONFIG_MAINBOARD_SERIAL_NUMBER="W8724XXXXXX"
 CONFIG_DCACHE_RAM_BASE=0xffdf8000
 CONFIG_DCACHE_RAM_SIZE=0x8000
@@ -130,16 +131,14 @@ CONFIG_POST_IO=y
 CONFIG_MAX_REBOOT_CNT=3
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
-CONFIG_RAMTOP=0x200000
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
-CONFIG_CBFS_SIZE=0x200000
 CONFIG_POST_DEVICE=y
+# CONFIG_DRIVERS_PS2_KEYBOARD is not set
+# CONFIG_CONSOLE_POST is not set
+CONFIG_DRIVERS_UART_8250IO=y
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 CONFIG_MAINBOARD_VERSION="1.0"
-# CONFIG_DRIVERS_PS2_KEYBOARD is not set
-CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_NO_POST is not set
 CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
 CONFIG_BOARD_ROMSIZE_KB_2048=y
@@ -153,9 +152,13 @@ CONFIG_COREBOOT_ROMSIZE_KB_2048=y
 # CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=2048
 CONFIG_ROM_SIZE=0x200000
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_FMDFILE=""
+# CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
 
@@ -168,18 +171,26 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 #
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
+CONFIG_ROMSTAGE_ADDR=0x2000000
+CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/i945/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c"
 CONFIG_EHCI_BAR=0xfef00000
+CONFIG_RAMTOP=0x200000
 CONFIG_HEAP_SIZE=0x4000
+CONFIG_CONSOLE_CBMEM=y
+CONFIG_UART_PCI_ADDR=0x0
+CONFIG_HPET_MIN_TICKS=0x80
 # CONFIG_SOC_MARVELL_ARMADA38X is not set
 # CONFIG_SOC_MARVELL_BG4CD is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
+# CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_SOC_ROCKCHIP_RK3288 is not set
+# CONFIG_SOC_ROCKCHIP_RK3399 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
 # CONFIG_SOC_UCB_RISCV is not set
@@ -202,22 +213,23 @@ CONFIG_SSE2=y
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
+# CONFIG_PARALLEL_MP is not set
+# CONFIG_UDELAY_IO is not set
 CONFIG_UDELAY_LAPIC=y
 CONFIG_LAPIC_MONOTONIC_TIMER=y
 # CONFIG_UDELAY_TSC is not set
 # CONFIG_UDELAY_TIMER2 is not set
-# CONFIG_TSC_CALIBRATE_WITH_IO is not set
 # CONFIG_TSC_SYNC_LFENCE is not set
 CONFIG_TSC_SYNC_MFENCE=y
+# CONFIG_NO_FIXED_XIP_ROM_SIZE is not set
 CONFIG_LOGICAL_CPUS=y
 # CONFIG_SMM_TSEG is not set
 CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
-# CONFIG_PARALLEL_MP is not set
-# CONFIG_BACKUP_DEFAULT_SMM_REGION is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
@@ -238,6 +250,7 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
 CONFIG_RAMBASE=0x100000
+# CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
 CONFIG_NORTHBRIDGE_INTEL_I945=y
 # CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC is not set
@@ -245,16 +258,7 @@ CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
 CONFIG_CHANNEL_XOR_RANDOMIZATION=y
 # CONFIG_OVERRIDE_CLOCK_DISABLE is not set
 # CONFIG_CHECK_SLFRCS_ON_RESUME is not set
-# CONFIG_VRAM_SIZE_1MB is not set
-# CONFIG_VRAM_SIZE_4MB is not set
-# CONFIG_VRAM_SIZE_8MB is not set
-# CONFIG_VRAM_SIZE_16MB is not set
-# CONFIG_VRAM_SIZE_32MB is not set
-# CONFIG_VRAM_SIZE_48MB is not set
-CONFIG_VRAM_SIZE_64MB=y
-CONFIG_VRAM_SIZE=0x70
 CONFIG_HPET_ADDRESS=0xfed00000
-CONFIG_HPET_MIN_TICKS=0x80
 CONFIG_MAX_PIRQ_LINKS=4
 
 #
@@ -275,8 +279,14 @@ CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
 # Embedded Controllers
 #
 CONFIG_EC_ACPI=y
+CONFIG_VBOOT_VBNV_OFFSET=0x26
+# CONFIG_VBOOT_VBNV_CMOS is not set
+# CONFIG_VBOOT_VBNV_EC is not set
+# CONFIG_VBOOT is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
+# CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
 # CONFIG_ARCH_VERSTAGE_ARM is not set
@@ -330,17 +340,18 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_USE_MARCH_586 is not set
 CONFIG_AP_IN_SIPI_WAIT=y
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 # CONFIG_ROMCC is not set
 # CONFIG_LATE_CBMEM_INIT is not set
 CONFIG_PC80_SYSTEM=y
+# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
+# CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
 CONFIG_HAVE_CMOS_DEFAULT=y
 CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_COMPILE_IN_DSDT is not set
-CONFIG_ROMSTAGE_ADDR=0x2000000
-CONFIG_VERSTAGE_ADDR=0x2000000
+# CONFIG_POSTCAR_STAGE is not set
+# CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
+# CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
 
 #
 # Devices
@@ -365,7 +376,6 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_PCIEXP_L1_SUB_STATE 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
 
 #
@@ -378,60 +388,66 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 # CONFIG_GIC is not set
+# CONFIG_IPMI_KCS is not set
+# CONFIG_DRIVERS_LENOVO_WACOM is not set
+# CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
+# CONFIG_REALTEK_8168_RESET is not set
+# CONFIG_SPI_FLASH is not set
+# CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
+# CONFIG_DRIVERS_UART is not set
+# CONFIG_NO_UART_ON_SUPERIO is not set
+# CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
+# CONFIG_UART_OVERRIDE_REFCLK is not set
+# CONFIG_DRIVERS_UART_8250MEM is not set
+# CONFIG_DRIVERS_UART_8250MEM_32 is not set
+# CONFIG_HAVE_UART_SPECIAL is not set
+# CONFIG_DRIVERS_UART_OXPCIE is not set
+# CONFIG_DRIVERS_UART_PL011 is not set
+# CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
+CONFIG_HAVE_USBDEBUG=y
+# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
 # CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
+# CONFIG_DRIVERS_I2C_PCF8523 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
+# CONFIG_DRIVER_I2C_TPM_ACPI is not set
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
 # CONFIG_DRIVER_INTEL_I210 is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM is not set
+CONFIG_DRIVERS_INTEL_WIFI=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
+# CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
+# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
-# CONFIG_SPI_FLASH is not set
-# CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_UART is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# CONFIG_DRIVERS_UART_8250MEM is not set
-# CONFIG_DRIVERS_UART_8250MEM_32 is not set
-# CONFIG_HAVE_UART_SPECIAL is not set
-# CONFIG_DRIVERS_UART_OXPCIE is not set
-# CONFIG_DRIVERS_UART_PL011 is not set
-CONFIG_HAVE_USBDEBUG=y
-# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
-CONFIG_RTC=y
+# CONFIG_ACPI_SATA_GENERATOR is not set
+CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
+# CONFIG_RTC is not set
 # CONFIG_TPM is not set
 CONFIG_STACK_SIZE=0x1000
 CONFIG_MMCONF_SUPPORT_DEFAULT=y
 CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
-CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
@@ -444,7 +460,6 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 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
@@ -485,6 +500,7 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="MacBook2,1"
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
@@ -493,10 +509,17 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_TIANOCORE is not set
 CONFIG_PAYLOAD_FILE="payload.elf"
 CONFIG_PAYLOAD_OPTIONS=""
+# CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
+
+#
+# Secondary Payloads
+#
 # CONFIG_COREINFO_SECONDARY_PAYLOAD is not set
 # CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
+# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
+# CONFIG_TINT_SECONDARY_PAYLOAD is not set
 
 #
 # Debugging
@@ -512,6 +535,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_TRACE is not set
+# CONFIG_DEBUG_BOOT_STATE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 CONFIG_IASL_WARNINGS_ARE_ERRORS=y
@@ -521,4 +545,5 @@ CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
 # CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
 # CONFIG_REG_SCRIPT is not set
-# CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_CREATE_BOARD_CHECKLIST is not set
+# CONFIG_MAKE_CHECKLIST_PUBLIC is not set
diff --git a/resources/libreboot/config/grub/qemu_i440fx_piix4/config b/resources/libreboot/config/grub/qemu_i440fx_piix4/config
index cdef35a8..7ffbaa51 100644
--- a/resources/libreboot/config/grub/qemu_i440fx_piix4/config
+++ b/resources/libreboot/config/grub/qemu_i440fx_piix4/config
@@ -398,14 +398,6 @@ CONFIG_STACK_SIZE=0x1000
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
diff --git a/resources/libreboot/config/grub/qemu_q35_ich9/config b/resources/libreboot/config/grub/qemu_q35_ich9/config
index 6896e432..fea57db7 100644
--- a/resources/libreboot/config/grub/qemu_q35_ich9/config
+++ b/resources/libreboot/config/grub/qemu_q35_ich9/config
@@ -400,14 +400,6 @@ CONFIG_MMCONF_SUPPORT=y
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
diff --git a/resources/libreboot/config/grub/r400_16mb/config b/resources/libreboot/config/grub/r400_16mb/config
index 99ba52bf..e30b3450 100644
--- a/resources/libreboot/config/grub/r400_16mb/config
+++ b/resources/libreboot/config/grub/r400_16mb/config
@@ -8,7 +8,6 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -22,6 +21,7 @@ CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 # CONFIG_NO_XIP_EARLY_STAGES is not set
 CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
@@ -128,6 +128,7 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
 CONFIG_USBDEBUG_HCD_INDEX=2
+# CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_CONSOLE_POST is not set
 CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_BOARD_LENOVO_G505S is not set
@@ -149,7 +150,6 @@ CONFIG_BOARD_LENOVO_R400=y
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
-# CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -166,6 +166,7 @@ CONFIG_COREBOOT_ROMSIZE_KB_16384=y
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=16384
 CONFIG_ROM_SIZE=0x1000000
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
@@ -195,7 +196,6 @@ CONFIG_HPET_MIN_TICKS=0x80
 # CONFIG_SOC_MARVELL_BG4CD is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
@@ -238,6 +238,7 @@ CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
@@ -271,7 +272,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=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -285,8 +286,13 @@ CONFIG_SUPERIO_NSC_PC87382=y
 CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_EC_LENOVO_PMH7=y
+CONFIG_VBOOT_VBNV_OFFSET=0x26
+# CONFIG_VBOOT_VBNV_CMOS is not set
+# CONFIG_VBOOT_VBNV_EC is not set
+# CONFIG_VBOOT is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -391,6 +397,8 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
+CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
+CONFIG_HYBRID_GRAPHICS_GPIO_NUM=52
 # CONFIG_REALTEK_8168_RESET is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
@@ -410,6 +418,7 @@ CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
+# CONFIG_DRIVER_I2C_TPM_ACPI is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
@@ -417,6 +426,7 @@ CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
 # CONFIG_DRIVER_INTEL_I210 is not set
+CONFIG_DRIVERS_INTEL_WIFI=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
@@ -431,26 +441,21 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_ACPI_SATA_GENERATOR is not set
 # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
 CONFIG_STACK_SIZE=0x1000
 CONFIG_MMCONF_SUPPORT_DEFAULT=y
 CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
@@ -502,6 +507,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
diff --git a/resources/libreboot/config/grub/r400_4mb/config b/resources/libreboot/config/grub/r400_4mb/config
index 14462e59..36541173 100644
--- a/resources/libreboot/config/grub/r400_4mb/config
+++ b/resources/libreboot/config/grub/r400_4mb/config
@@ -8,7 +8,6 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -22,6 +21,7 @@ CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 # CONFIG_NO_XIP_EARLY_STAGES is not set
 CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
@@ -128,6 +128,7 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
 CONFIG_USBDEBUG_HCD_INDEX=2
+# CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_CONSOLE_POST is not set
 CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_BOARD_LENOVO_G505S is not set
@@ -149,7 +150,6 @@ CONFIG_BOARD_LENOVO_R400=y
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
-# CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -166,6 +166,7 @@ CONFIG_COREBOOT_ROMSIZE_KB_4096=y
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=4096
 CONFIG_ROM_SIZE=0x400000
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
@@ -195,7 +196,6 @@ CONFIG_HPET_MIN_TICKS=0x80
 # CONFIG_SOC_MARVELL_BG4CD is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
@@ -238,6 +238,7 @@ CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
@@ -271,7 +272,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=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -285,8 +286,13 @@ CONFIG_SUPERIO_NSC_PC87382=y
 CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_EC_LENOVO_PMH7=y
+CONFIG_VBOOT_VBNV_OFFSET=0x26
+# CONFIG_VBOOT_VBNV_CMOS is not set
+# CONFIG_VBOOT_VBNV_EC is not set
+# CONFIG_VBOOT is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -391,6 +397,8 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
+CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
+CONFIG_HYBRID_GRAPHICS_GPIO_NUM=52
 # CONFIG_REALTEK_8168_RESET is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
@@ -410,6 +418,7 @@ CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
+# CONFIG_DRIVER_I2C_TPM_ACPI is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
@@ -417,6 +426,7 @@ CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
 # CONFIG_DRIVER_INTEL_I210 is not set
+CONFIG_DRIVERS_INTEL_WIFI=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
@@ -431,26 +441,21 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_ACPI_SATA_GENERATOR is not set
 # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
 CONFIG_STACK_SIZE=0x1000
 CONFIG_MMCONF_SUPPORT_DEFAULT=y
 CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
@@ -502,6 +507,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
diff --git a/resources/libreboot/config/grub/r400_8mb/config b/resources/libreboot/config/grub/r400_8mb/config
index cc9561ea..69168b00 100644
--- a/resources/libreboot/config/grub/r400_8mb/config
+++ b/resources/libreboot/config/grub/r400_8mb/config
@@ -8,7 +8,6 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -22,6 +21,7 @@ CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 # CONFIG_NO_XIP_EARLY_STAGES is not set
 CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
@@ -128,6 +128,7 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
 CONFIG_USBDEBUG_HCD_INDEX=2
+# CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_CONSOLE_POST is not set
 CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_BOARD_LENOVO_G505S is not set
@@ -149,7 +150,6 @@ CONFIG_BOARD_LENOVO_R400=y
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
-# CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -166,6 +166,7 @@ CONFIG_COREBOOT_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=8192
 CONFIG_ROM_SIZE=0x800000
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
@@ -195,7 +196,6 @@ CONFIG_HPET_MIN_TICKS=0x80
 # CONFIG_SOC_MARVELL_BG4CD is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
@@ -238,6 +238,7 @@ CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
@@ -271,7 +272,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=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -285,8 +286,13 @@ CONFIG_SUPERIO_NSC_PC87382=y
 CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_EC_LENOVO_PMH7=y
+CONFIG_VBOOT_VBNV_OFFSET=0x26
+# CONFIG_VBOOT_VBNV_CMOS is not set
+# CONFIG_VBOOT_VBNV_EC is not set
+# CONFIG_VBOOT is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -391,6 +397,8 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
+CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
+CONFIG_HYBRID_GRAPHICS_GPIO_NUM=52
 # CONFIG_REALTEK_8168_RESET is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
@@ -410,6 +418,7 @@ CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
+# CONFIG_DRIVER_I2C_TPM_ACPI is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
@@ -417,6 +426,7 @@ CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
 # CONFIG_DRIVER_INTEL_I210 is not set
+CONFIG_DRIVERS_INTEL_WIFI=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
@@ -431,26 +441,21 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_ACPI_SATA_GENERATOR is not set
 # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
 CONFIG_STACK_SIZE=0x1000
 CONFIG_MMCONF_SUPPORT_DEFAULT=y
 CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
@@ -502,6 +507,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
diff --git a/resources/libreboot/config/grub/t400_16mb/config b/resources/libreboot/config/grub/t400_16mb/config
index 30e4cc15..69bf0e11 100644
--- a/resources/libreboot/config/grub/t400_16mb/config
+++ b/resources/libreboot/config/grub/t400_16mb/config
@@ -8,7 +8,6 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -22,6 +21,7 @@ CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 # CONFIG_NO_XIP_EARLY_STAGES is not set
 CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
@@ -128,6 +128,7 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
 CONFIG_USBDEBUG_HCD_INDEX=2
+# CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_CONSOLE_POST is not set
 CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_BOARD_LENOVO_G505S is not set
@@ -149,7 +150,6 @@ CONFIG_BOARD_LENOVO_T400=y
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
-# CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -166,6 +166,7 @@ CONFIG_COREBOOT_ROMSIZE_KB_16384=y
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=16384
 CONFIG_ROM_SIZE=0x1000000
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
@@ -195,7 +196,6 @@ CONFIG_HPET_MIN_TICKS=0x80
 # CONFIG_SOC_MARVELL_BG4CD is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
@@ -238,6 +238,7 @@ CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
@@ -271,7 +272,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=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -285,8 +286,13 @@ CONFIG_SUPERIO_NSC_PC87382=y
 CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_EC_LENOVO_PMH7=y
+CONFIG_VBOOT_VBNV_OFFSET=0x26
+# CONFIG_VBOOT_VBNV_CMOS is not set
+# CONFIG_VBOOT_VBNV_EC is not set
+# CONFIG_VBOOT is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -391,6 +397,8 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
+CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
+CONFIG_HYBRID_GRAPHICS_GPIO_NUM=52
 # CONFIG_REALTEK_8168_RESET is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
@@ -410,6 +418,7 @@ CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
+# CONFIG_DRIVER_I2C_TPM_ACPI is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
@@ -417,6 +426,7 @@ CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
 # CONFIG_DRIVER_INTEL_I210 is not set
+CONFIG_DRIVERS_INTEL_WIFI=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
@@ -431,26 +441,21 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_ACPI_SATA_GENERATOR is not set
 # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
 CONFIG_STACK_SIZE=0x1000
 CONFIG_MMCONF_SUPPORT_DEFAULT=y
 CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
@@ -502,6 +507,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
diff --git a/resources/libreboot/config/grub/t400_4mb/config b/resources/libreboot/config/grub/t400_4mb/config
index 0517f1e7..bb337879 100644
--- a/resources/libreboot/config/grub/t400_4mb/config
+++ b/resources/libreboot/config/grub/t400_4mb/config
@@ -8,7 +8,6 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -22,6 +21,7 @@ CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 # CONFIG_NO_XIP_EARLY_STAGES is not set
 CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
@@ -128,6 +128,7 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
 CONFIG_USBDEBUG_HCD_INDEX=2
+# CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_CONSOLE_POST is not set
 CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_BOARD_LENOVO_G505S is not set
@@ -149,7 +150,6 @@ CONFIG_BOARD_LENOVO_T400=y
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
-# CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -166,6 +166,7 @@ CONFIG_COREBOOT_ROMSIZE_KB_4096=y
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=4096
 CONFIG_ROM_SIZE=0x400000
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
@@ -195,7 +196,6 @@ CONFIG_HPET_MIN_TICKS=0x80
 # CONFIG_SOC_MARVELL_BG4CD is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
@@ -238,6 +238,7 @@ CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
@@ -271,7 +272,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=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -285,8 +286,13 @@ CONFIG_SUPERIO_NSC_PC87382=y
 CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_EC_LENOVO_PMH7=y
+CONFIG_VBOOT_VBNV_OFFSET=0x26
+# CONFIG_VBOOT_VBNV_CMOS is not set
+# CONFIG_VBOOT_VBNV_EC is not set
+# CONFIG_VBOOT is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -391,6 +397,8 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
+CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
+CONFIG_HYBRID_GRAPHICS_GPIO_NUM=52
 # CONFIG_REALTEK_8168_RESET is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
@@ -410,6 +418,7 @@ CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
+# CONFIG_DRIVER_I2C_TPM_ACPI is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
@@ -417,6 +426,7 @@ CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
 # CONFIG_DRIVER_INTEL_I210 is not set
+CONFIG_DRIVERS_INTEL_WIFI=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
@@ -431,26 +441,21 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_ACPI_SATA_GENERATOR is not set
 # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
 CONFIG_STACK_SIZE=0x1000
 CONFIG_MMCONF_SUPPORT_DEFAULT=y
 CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
@@ -502,6 +507,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
diff --git a/resources/libreboot/config/grub/t400_8mb/config b/resources/libreboot/config/grub/t400_8mb/config
index be9f61cf..82541023 100644
--- a/resources/libreboot/config/grub/t400_8mb/config
+++ b/resources/libreboot/config/grub/t400_8mb/config
@@ -8,7 +8,6 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -22,6 +21,7 @@ CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 # CONFIG_NO_XIP_EARLY_STAGES is not set
 CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
@@ -128,6 +128,7 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
 CONFIG_USBDEBUG_HCD_INDEX=2
+# CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_CONSOLE_POST is not set
 CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_BOARD_LENOVO_G505S is not set
@@ -149,7 +150,6 @@ CONFIG_BOARD_LENOVO_T400=y
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
-# CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -166,6 +166,7 @@ CONFIG_COREBOOT_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=8192
 CONFIG_ROM_SIZE=0x800000
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
@@ -195,7 +196,6 @@ CONFIG_HPET_MIN_TICKS=0x80
 # CONFIG_SOC_MARVELL_BG4CD is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
@@ -238,6 +238,7 @@ CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
@@ -271,7 +272,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=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -285,8 +286,13 @@ CONFIG_SUPERIO_NSC_PC87382=y
 CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_EC_LENOVO_PMH7=y
+CONFIG_VBOOT_VBNV_OFFSET=0x26
+# CONFIG_VBOOT_VBNV_CMOS is not set
+# CONFIG_VBOOT_VBNV_EC is not set
+# CONFIG_VBOOT is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -391,6 +397,8 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
+CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
+CONFIG_HYBRID_GRAPHICS_GPIO_NUM=52
 # CONFIG_REALTEK_8168_RESET is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
@@ -410,6 +418,7 @@ CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
+# CONFIG_DRIVER_I2C_TPM_ACPI is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
@@ -417,6 +426,7 @@ CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
 # CONFIG_DRIVER_INTEL_I210 is not set
+CONFIG_DRIVERS_INTEL_WIFI=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
@@ -431,26 +441,21 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_ACPI_SATA_GENERATOR is not set
 # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
 CONFIG_STACK_SIZE=0x1000
 CONFIG_MMCONF_SUPPORT_DEFAULT=y
 CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
@@ -502,6 +507,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
diff --git a/resources/libreboot/config/grub/t500_16mb/config b/resources/libreboot/config/grub/t500_16mb/config
index c7227761..9b96df8e 100644
--- a/resources/libreboot/config/grub/t500_16mb/config
+++ b/resources/libreboot/config/grub/t500_16mb/config
@@ -8,7 +8,6 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -22,6 +21,7 @@ CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 # CONFIG_NO_XIP_EARLY_STAGES is not set
 CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
@@ -128,6 +128,7 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
 CONFIG_USBDEBUG_HCD_INDEX=2
+# CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_CONSOLE_POST is not set
 CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_BOARD_LENOVO_G505S is not set
@@ -149,7 +150,6 @@ CONFIG_BOARD_LENOVO_T500=y
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
-# CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -166,6 +166,7 @@ CONFIG_COREBOOT_ROMSIZE_KB_16384=y
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=16384
 CONFIG_ROM_SIZE=0x1000000
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
@@ -195,7 +196,6 @@ CONFIG_HPET_MIN_TICKS=0x80
 # CONFIG_SOC_MARVELL_BG4CD is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
@@ -238,6 +238,7 @@ CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
@@ -271,7 +272,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=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -285,8 +286,13 @@ CONFIG_SUPERIO_NSC_PC87382=y
 CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_EC_LENOVO_PMH7=y
+CONFIG_VBOOT_VBNV_OFFSET=0x26
+# CONFIG_VBOOT_VBNV_CMOS is not set
+# CONFIG_VBOOT_VBNV_EC is not set
+# CONFIG_VBOOT is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -391,6 +397,8 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
+CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
+CONFIG_HYBRID_GRAPHICS_GPIO_NUM=52
 # CONFIG_REALTEK_8168_RESET is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
@@ -410,6 +418,7 @@ CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
+# CONFIG_DRIVER_I2C_TPM_ACPI is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
@@ -417,6 +426,7 @@ CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
 # CONFIG_DRIVER_INTEL_I210 is not set
+CONFIG_DRIVERS_INTEL_WIFI=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
@@ -431,26 +441,21 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_ACPI_SATA_GENERATOR is not set
 # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
 CONFIG_STACK_SIZE=0x1000
 CONFIG_MMCONF_SUPPORT_DEFAULT=y
 CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
@@ -502,6 +507,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
diff --git a/resources/libreboot/config/grub/t500_4mb/config b/resources/libreboot/config/grub/t500_4mb/config
index 1a09b085..6d8236fd 100644
--- a/resources/libreboot/config/grub/t500_4mb/config
+++ b/resources/libreboot/config/grub/t500_4mb/config
@@ -8,7 +8,6 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -22,6 +21,7 @@ CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 # CONFIG_NO_XIP_EARLY_STAGES is not set
 CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
@@ -128,6 +128,7 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
 CONFIG_USBDEBUG_HCD_INDEX=2
+# CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_CONSOLE_POST is not set
 CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_BOARD_LENOVO_G505S is not set
@@ -149,7 +150,6 @@ CONFIG_BOARD_LENOVO_T500=y
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
-# CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -166,6 +166,7 @@ CONFIG_COREBOOT_ROMSIZE_KB_4096=y
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=4096
 CONFIG_ROM_SIZE=0x400000
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
@@ -195,7 +196,6 @@ CONFIG_HPET_MIN_TICKS=0x80
 # CONFIG_SOC_MARVELL_BG4CD is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
@@ -238,6 +238,7 @@ CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
@@ -271,7 +272,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=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -285,8 +286,13 @@ CONFIG_SUPERIO_NSC_PC87382=y
 CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_EC_LENOVO_PMH7=y
+CONFIG_VBOOT_VBNV_OFFSET=0x26
+# CONFIG_VBOOT_VBNV_CMOS is not set
+# CONFIG_VBOOT_VBNV_EC is not set
+# CONFIG_VBOOT is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -391,6 +397,8 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
+CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
+CONFIG_HYBRID_GRAPHICS_GPIO_NUM=52
 # CONFIG_REALTEK_8168_RESET is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
@@ -410,6 +418,7 @@ CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
+# CONFIG_DRIVER_I2C_TPM_ACPI is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
@@ -417,6 +426,7 @@ CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
 # CONFIG_DRIVER_INTEL_I210 is not set
+CONFIG_DRIVERS_INTEL_WIFI=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
@@ -431,26 +441,21 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_ACPI_SATA_GENERATOR is not set
 # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
 CONFIG_STACK_SIZE=0x1000
 CONFIG_MMCONF_SUPPORT_DEFAULT=y
 CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
@@ -502,6 +507,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
diff --git a/resources/libreboot/config/grub/t500_8mb/config b/resources/libreboot/config/grub/t500_8mb/config
index b24f8e5b..29ed2e92 100644
--- a/resources/libreboot/config/grub/t500_8mb/config
+++ b/resources/libreboot/config/grub/t500_8mb/config
@@ -8,7 +8,6 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -22,6 +21,7 @@ CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 # CONFIG_NO_XIP_EARLY_STAGES is not set
 CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
@@ -128,6 +128,7 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
 CONFIG_USBDEBUG_HCD_INDEX=2
+# CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_CONSOLE_POST is not set
 CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_BOARD_LENOVO_G505S is not set
@@ -149,7 +150,6 @@ CONFIG_BOARD_LENOVO_T500=y
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
-# CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -166,6 +166,7 @@ CONFIG_COREBOOT_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=8192
 CONFIG_ROM_SIZE=0x800000
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
@@ -195,7 +196,6 @@ CONFIG_HPET_MIN_TICKS=0x80
 # CONFIG_SOC_MARVELL_BG4CD is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
@@ -238,6 +238,7 @@ CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
@@ -271,7 +272,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=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -285,8 +286,13 @@ CONFIG_SUPERIO_NSC_PC87382=y
 CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_EC_LENOVO_PMH7=y
+CONFIG_VBOOT_VBNV_OFFSET=0x26
+# CONFIG_VBOOT_VBNV_CMOS is not set
+# CONFIG_VBOOT_VBNV_EC is not set
+# CONFIG_VBOOT is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -391,6 +397,8 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
+CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
+CONFIG_HYBRID_GRAPHICS_GPIO_NUM=52
 # CONFIG_REALTEK_8168_RESET is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
@@ -410,6 +418,7 @@ CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
+# CONFIG_DRIVER_I2C_TPM_ACPI is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
@@ -417,6 +426,7 @@ CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
 # CONFIG_DRIVER_INTEL_I210 is not set
+CONFIG_DRIVERS_INTEL_WIFI=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
@@ -431,26 +441,21 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_ACPI_SATA_GENERATOR is not set
 # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
 CONFIG_STACK_SIZE=0x1000
 CONFIG_MMCONF_SUPPORT_DEFAULT=y
 CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
@@ -502,6 +507,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
diff --git a/resources/libreboot/config/grub/t60/config b/resources/libreboot/config/grub/t60/config
index 31ca0d51..f87d5e0d 100644
--- a/resources/libreboot/config/grub/t60/config
+++ b/resources/libreboot/config/grub/t60/config
@@ -8,7 +8,6 @@
 #
 CONFIG_LOCALVERSION="79ETE7WW (2.27 )"
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -19,15 +18,16 @@ CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
 # CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
-# CONFIG_COMPRESS_PRERAM_STAGES is not set
 CONFIG_INCLUDE_CONFIG_FILE=y
+# CONFIG_NO_XIP_EARLY_STAGES is not set
 CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
 # CONFIG_RELOCATABLE_MODULES is not set
 # CONFIG_RELOCATABLE_RAMSTAGE is not set
-CONFIG_FLASHMAP_OFFSET=0x0
+# CONFIG_NO_STAGE_CACHE is not set
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_CUSTOM=y
@@ -39,7 +39,6 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_BOARD_ID_MANUAL is not set
 # CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
-# CONFIG_ACPI_SATA_GENERATOR is not set
 
 #
 # Mainboard
@@ -47,6 +46,7 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ABIT is not set
+# CONFIG_VENDOR_ADI is not set
 # CONFIG_VENDOR_ADLINK is not set
 # CONFIG_VENDOR_ADVANSUS is not set
 # CONFIG_VENDOR_AMD is not set
@@ -114,10 +114,11 @@ CONFIG_MAINBOARD_DIR="lenovo/t60"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad T60"
 CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_CBFS_SIZE=0x200000
 CONFIG_VGA_BIOS_ID="8086,27a2"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 # CONFIG_VGA_BIOS is not set
-# CONFIG_UDELAY_IO is not set
 CONFIG_DCACHE_RAM_BASE=0xffdf8000
 CONFIG_DCACHE_RAM_SIZE=0x8000
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
@@ -125,13 +126,14 @@ CONFIG_POST_IO=y
 CONFIG_MAX_REBOOT_CNT=3
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
-CONFIG_RAMTOP=0x200000
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
-CONFIG_CBFS_SIZE=0x200000
 CONFIG_POST_DEVICE=y
+# CONFIG_DRIVERS_PS2_KEYBOARD is not set
+# CONFIG_CONSOLE_POST is not set
+CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_BOARD_LENOVO_G505S is not set
 # CONFIG_BOARD_LENOVO_R400 is not set
 # CONFIG_BOARD_LENOVO_T400 is not set
+# CONFIG_BOARD_LENOVO_T420 is not set
 # CONFIG_BOARD_LENOVO_T420S is not set
 # CONFIG_BOARD_LENOVO_T430S is not set
 # CONFIG_BOARD_LENOVO_T500 is not set
@@ -148,8 +150,6 @@ CONFIG_SEABIOS_PS2_TIMEOUT=3000
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
-# CONFIG_DRIVERS_PS2_KEYBOARD is not set
-CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_NO_POST is not set
 CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
 CONFIG_BOARD_ROMSIZE_KB_2048=y
@@ -163,9 +163,13 @@ CONFIG_COREBOOT_ROMSIZE_KB_2048=y
 # CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=2048
 CONFIG_ROM_SIZE=0x200000
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_FMDFILE=""
+# CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
 
@@ -178,18 +182,26 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 #
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
+CONFIG_ROMSTAGE_ADDR=0x2000000
+CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/i945/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c"
 CONFIG_EHCI_BAR=0xfef00000
+CONFIG_RAMTOP=0x200000
 CONFIG_HEAP_SIZE=0x4000
+CONFIG_CONSOLE_CBMEM=y
+CONFIG_UART_PCI_ADDR=0x0
+CONFIG_HPET_MIN_TICKS=0x80
 # CONFIG_SOC_MARVELL_ARMADA38X is not set
 # CONFIG_SOC_MARVELL_BG4CD is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
+# CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_SOC_ROCKCHIP_RK3288 is not set
+# CONFIG_SOC_ROCKCHIP_RK3399 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
 # CONFIG_SOC_UCB_RISCV is not set
@@ -212,22 +224,23 @@ CONFIG_SSE2=y
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
+# CONFIG_PARALLEL_MP is not set
+# CONFIG_UDELAY_IO is not set
 CONFIG_UDELAY_LAPIC=y
 CONFIG_LAPIC_MONOTONIC_TIMER=y
 # CONFIG_UDELAY_TSC is not set
 # CONFIG_UDELAY_TIMER2 is not set
-# CONFIG_TSC_CALIBRATE_WITH_IO is not set
 # CONFIG_TSC_SYNC_LFENCE is not set
 CONFIG_TSC_SYNC_MFENCE=y
+# CONFIG_NO_FIXED_XIP_ROM_SIZE is not set
 CONFIG_LOGICAL_CPUS=y
 # CONFIG_SMM_TSEG is not set
 CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
-# CONFIG_PARALLEL_MP is not set
-# CONFIG_BACKUP_DEFAULT_SMM_REGION is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
@@ -248,6 +261,7 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
 CONFIG_RAMBASE=0x100000
+# CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
 CONFIG_NORTHBRIDGE_INTEL_I945=y
 # CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC is not set
@@ -255,16 +269,7 @@ CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
 CONFIG_CHANNEL_XOR_RANDOMIZATION=y
 # CONFIG_OVERRIDE_CLOCK_DISABLE is not set
 # CONFIG_CHECK_SLFRCS_ON_RESUME is not set
-# CONFIG_VRAM_SIZE_1MB is not set
-# CONFIG_VRAM_SIZE_4MB is not set
-# CONFIG_VRAM_SIZE_8MB is not set
-# CONFIG_VRAM_SIZE_16MB is not set
-# CONFIG_VRAM_SIZE_32MB is not set
-# CONFIG_VRAM_SIZE_48MB is not set
-CONFIG_VRAM_SIZE_64MB=y
-CONFIG_VRAM_SIZE=0x70
 CONFIG_HPET_ADDRESS=0xfed00000
-CONFIG_HPET_MIN_TICKS=0x80
 CONFIG_MAX_PIRQ_LINKS=4
 
 #
@@ -291,8 +296,14 @@ CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
+CONFIG_VBOOT_VBNV_OFFSET=0x26
+# CONFIG_VBOOT_VBNV_CMOS is not set
+# CONFIG_VBOOT_VBNV_EC is not set
+# CONFIG_VBOOT is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
+# CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
 # CONFIG_ARCH_VERSTAGE_ARM is not set
@@ -346,17 +357,18 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_USE_MARCH_586 is not set
 CONFIG_AP_IN_SIPI_WAIT=y
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 # CONFIG_ROMCC is not set
 # CONFIG_LATE_CBMEM_INIT is not set
 CONFIG_PC80_SYSTEM=y
+# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
+# CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
 CONFIG_HAVE_CMOS_DEFAULT=y
 CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_COMPILE_IN_DSDT is not set
-CONFIG_ROMSTAGE_ADDR=0x2000000
-CONFIG_VERSTAGE_ADDR=0x2000000
+# CONFIG_POSTCAR_STAGE is not set
+# CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
+# CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
 
 #
 # Devices
@@ -381,7 +393,6 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_PCIEXP_L1_SUB_STATE 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
 
 #
@@ -394,8 +405,28 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 # CONFIG_GIC is not set
+# CONFIG_IPMI_KCS is not set
+# CONFIG_DRIVERS_LENOVO_WACOM is not set
+# CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
+# CONFIG_REALTEK_8168_RESET is not set
+# CONFIG_SPI_FLASH is not set
+# CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
+# CONFIG_DRIVERS_UART is not set
+# CONFIG_NO_UART_ON_SUPERIO is not set
+# CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
+# CONFIG_UART_OVERRIDE_REFCLK is not set
+# CONFIG_DRIVERS_UART_8250MEM is not set
+# CONFIG_DRIVERS_UART_8250MEM_32 is not set
+# CONFIG_HAVE_UART_SPECIAL is not set
+# CONFIG_DRIVERS_UART_OXPCIE is not set
+# CONFIG_DRIVERS_UART_PL011 is not set
+# CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
+CONFIG_HAVE_USBDEBUG=y
+# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
+# CONFIG_DRIVERS_I2C_PCF8523 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
+# CONFIG_DRIVER_I2C_TPM_ACPI is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
@@ -403,52 +434,38 @@ CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
 # CONFIG_DRIVER_INTEL_I210 is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM is not set
+CONFIG_DRIVERS_INTEL_WIFI=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
+# CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
+# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
-# CONFIG_SPI_FLASH is not set
-# CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_UART is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# CONFIG_DRIVERS_UART_8250MEM is not set
-# CONFIG_DRIVERS_UART_8250MEM_32 is not set
-# CONFIG_HAVE_UART_SPECIAL is not set
-# CONFIG_DRIVERS_UART_OXPCIE is not set
-# CONFIG_DRIVERS_UART_PL011 is not set
-CONFIG_HAVE_USBDEBUG=y
-# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
-CONFIG_RTC=y
+# CONFIG_ACPI_SATA_GENERATOR is not set
+CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
+# CONFIG_RTC is not set
 # CONFIG_TPM is not set
 CONFIG_STACK_SIZE=0x1000
 CONFIG_MMCONF_SUPPORT_DEFAULT=y
 CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
-CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
@@ -461,7 +478,6 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 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
@@ -501,6 +517,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
@@ -509,10 +526,17 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_TIANOCORE is not set
 CONFIG_PAYLOAD_FILE="payload.elf"
 CONFIG_PAYLOAD_OPTIONS=""
+# CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
+
+#
+# Secondary Payloads
+#
 # CONFIG_COREINFO_SECONDARY_PAYLOAD is not set
 # CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
+# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
+# CONFIG_TINT_SECONDARY_PAYLOAD is not set
 
 #
 # Debugging
@@ -528,6 +552,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_TRACE is not set
+# CONFIG_DEBUG_BOOT_STATE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 CONFIG_IASL_WARNINGS_ARE_ERRORS=y
@@ -537,4 +562,5 @@ CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
 # CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
 # CONFIG_REG_SCRIPT is not set
-# CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_CREATE_BOARD_CHECKLIST is not set
+# CONFIG_MAKE_CHECKLIST_PUBLIC is not set
diff --git a/resources/libreboot/config/grub/x200_16mb/config b/resources/libreboot/config/grub/x200_16mb/config
index b50d32b1..51b4765b 100644
--- a/resources/libreboot/config/grub/x200_16mb/config
+++ b/resources/libreboot/config/grub/x200_16mb/config
@@ -8,7 +8,6 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -22,6 +21,7 @@ CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 # CONFIG_NO_XIP_EARLY_STAGES is not set
 CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
@@ -128,6 +128,7 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
 CONFIG_USBDEBUG_HCD_INDEX=2
+# CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_CONSOLE_POST is not set
 # CONFIG_DRIVERS_UART_8250IO is not set
 # CONFIG_BOARD_LENOVO_G505S is not set
@@ -149,7 +150,6 @@ CONFIG_BOARD_LENOVO_X200=y
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
-# CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -166,6 +166,7 @@ CONFIG_COREBOOT_ROMSIZE_KB_16384=y
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=16384
 CONFIG_ROM_SIZE=0x1000000
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
@@ -195,7 +196,6 @@ CONFIG_HPET_MIN_TICKS=0x80
 # CONFIG_SOC_MARVELL_BG4CD is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
@@ -238,6 +238,7 @@ CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
@@ -285,8 +286,13 @@ CONFIG_SUPERIO_NSC_PC87382=y
 CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_EC_LENOVO_PMH7=y
+CONFIG_VBOOT_VBNV_OFFSET=0x26
+# CONFIG_VBOOT_VBNV_CMOS is not set
+# CONFIG_VBOOT_VBNV_EC is not set
+# CONFIG_VBOOT is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -414,6 +420,7 @@ CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
+# CONFIG_DRIVER_I2C_TPM_ACPI is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
@@ -421,6 +428,7 @@ CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
 # CONFIG_DRIVER_INTEL_I210 is not set
+CONFIG_DRIVERS_INTEL_WIFI=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
@@ -435,12 +443,15 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_ACPI_SATA_GENERATOR is not set
 # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
 CONFIG_STACK_SIZE=0x1000
 CONFIG_MMCONF_SUPPORT_DEFAULT=y
 CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
 
 #
 # Console
@@ -497,6 +508,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
diff --git a/resources/libreboot/config/grub/x200_4mb/config b/resources/libreboot/config/grub/x200_4mb/config
index 38812ee7..ba4e44c9 100644
--- a/resources/libreboot/config/grub/x200_4mb/config
+++ b/resources/libreboot/config/grub/x200_4mb/config
@@ -8,7 +8,6 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -22,6 +21,7 @@ CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 # CONFIG_NO_XIP_EARLY_STAGES is not set
 CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
@@ -128,6 +128,7 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
 CONFIG_USBDEBUG_HCD_INDEX=2
+# CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_CONSOLE_POST is not set
 # CONFIG_DRIVERS_UART_8250IO is not set
 # CONFIG_BOARD_LENOVO_G505S is not set
@@ -149,7 +150,6 @@ CONFIG_BOARD_LENOVO_X200=y
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
-# CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -166,6 +166,7 @@ CONFIG_COREBOOT_ROMSIZE_KB_4096=y
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=4096
 CONFIG_ROM_SIZE=0x400000
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
@@ -195,7 +196,6 @@ CONFIG_HPET_MIN_TICKS=0x80
 # CONFIG_SOC_MARVELL_BG4CD is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
@@ -238,6 +238,7 @@ CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
@@ -285,8 +286,13 @@ CONFIG_SUPERIO_NSC_PC87382=y
 CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_EC_LENOVO_PMH7=y
+CONFIG_VBOOT_VBNV_OFFSET=0x26
+# CONFIG_VBOOT_VBNV_CMOS is not set
+# CONFIG_VBOOT_VBNV_EC is not set
+# CONFIG_VBOOT is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -414,6 +420,7 @@ CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
+# CONFIG_DRIVER_I2C_TPM_ACPI is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
@@ -421,6 +428,7 @@ CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
 # CONFIG_DRIVER_INTEL_I210 is not set
+CONFIG_DRIVERS_INTEL_WIFI=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
@@ -435,12 +443,15 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_ACPI_SATA_GENERATOR is not set
 # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
 CONFIG_STACK_SIZE=0x1000
 CONFIG_MMCONF_SUPPORT_DEFAULT=y
 CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
 
 #
 # Console
@@ -497,6 +508,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
diff --git a/resources/libreboot/config/grub/x200_8mb/config b/resources/libreboot/config/grub/x200_8mb/config
index 94636c64..3f2b0ea6 100644
--- a/resources/libreboot/config/grub/x200_8mb/config
+++ b/resources/libreboot/config/grub/x200_8mb/config
@@ -8,7 +8,6 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -22,6 +21,7 @@ CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 # CONFIG_NO_XIP_EARLY_STAGES is not set
 CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
@@ -128,6 +128,7 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POST_DEVICE=y
 CONFIG_USBDEBUG_HCD_INDEX=2
+# CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_CONSOLE_POST is not set
 # CONFIG_DRIVERS_UART_8250IO is not set
 # CONFIG_BOARD_LENOVO_G505S is not set
@@ -149,7 +150,6 @@ CONFIG_BOARD_LENOVO_X200=y
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
-# CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -166,6 +166,7 @@ CONFIG_COREBOOT_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=8192
 CONFIG_ROM_SIZE=0x800000
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_FMDFILE=""
 # CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
@@ -195,7 +196,6 @@ CONFIG_HPET_MIN_TICKS=0x80
 # CONFIG_SOC_MARVELL_BG4CD is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
@@ -238,6 +238,7 @@ CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
@@ -285,8 +286,13 @@ CONFIG_SUPERIO_NSC_PC87382=y
 CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_EC_LENOVO_PMH7=y
+CONFIG_VBOOT_VBNV_OFFSET=0x26
+# CONFIG_VBOOT_VBNV_CMOS is not set
+# CONFIG_VBOOT_VBNV_EC is not set
+# CONFIG_VBOOT is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -414,6 +420,7 @@ CONFIG_DRIVERS_GENERIC_IOAPIC=y
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
+# CONFIG_DRIVER_I2C_TPM_ACPI is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
@@ -421,6 +428,7 @@ CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=y
 # CONFIG_DRIVER_INTEL_I210 is not set
+CONFIG_DRIVERS_INTEL_WIFI=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
@@ -435,12 +443,15 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_ACPI_SATA_GENERATOR is not set
 # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
 CONFIG_STACK_SIZE=0x1000
 CONFIG_MMCONF_SUPPORT_DEFAULT=y
 CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
 
 #
 # Console
@@ -497,6 +508,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
diff --git a/resources/libreboot/config/grub/x60/config b/resources/libreboot/config/grub/x60/config
index 76c2f6c8..9d3f6b00 100644
--- a/resources/libreboot/config/grub/x60/config
+++ b/resources/libreboot/config/grub/x60/config
@@ -8,7 +8,6 @@
 #
 CONFIG_LOCALVERSION=""
 CONFIG_CBFS_PREFIX="fallback"
-# CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
 # CONFIG_COMPILER_LLVM_CLANG is not set
 # CONFIG_ANY_TOOLCHAIN is not set
@@ -19,15 +18,16 @@ CONFIG_USE_OPTION_TABLE=y
 CONFIG_STATIC_OPTION_TABLE=y
 # CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
-# CONFIG_COMPRESS_PRERAM_STAGES is not set
 CONFIG_INCLUDE_CONFIG_FILE=y
+# CONFIG_NO_XIP_EARLY_STAGES is not set
 CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
 # CONFIG_RELOCATABLE_MODULES is not set
 # CONFIG_RELOCATABLE_RAMSTAGE is not set
-CONFIG_FLASHMAP_OFFSET=0x0
+# CONFIG_NO_STAGE_CACHE is not set
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_CUSTOM=y
@@ -39,7 +39,6 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_BOARD_ID_MANUAL is not set
 # CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
-# CONFIG_ACPI_SATA_GENERATOR is not set
 
 #
 # Mainboard
@@ -47,6 +46,7 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_A_TREND is not set
 # CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ABIT is not set
+# CONFIG_VENDOR_ADI is not set
 # CONFIG_VENDOR_ADLINK is not set
 # CONFIG_VENDOR_ADVANSUS is not set
 # CONFIG_VENDOR_AMD is not set
@@ -115,10 +115,11 @@ CONFIG_MAINBOARD_PART_NUMBER="ThinkPad X60"
 CONFIG_IRQ_SLOT_COUNT=18
 CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=2
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_CBFS_SIZE=0x200000
 CONFIG_VGA_BIOS_ID="8086,27a2"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 # CONFIG_VGA_BIOS is not set
-# CONFIG_UDELAY_IO is not set
 CONFIG_DCACHE_RAM_BASE=0xffdf8000
 CONFIG_DCACHE_RAM_SIZE=0x8000
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
@@ -126,13 +127,14 @@ CONFIG_POST_IO=y
 CONFIG_MAX_REBOOT_CNT=3
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_ID_SECTION_OFFSET=0x80
-CONFIG_RAMTOP=0x200000
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
-CONFIG_CBFS_SIZE=0x200000
 CONFIG_POST_DEVICE=y
+# CONFIG_DRIVERS_PS2_KEYBOARD is not set
+# CONFIG_CONSOLE_POST is not set
+CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_BOARD_LENOVO_G505S is not set
 # CONFIG_BOARD_LENOVO_R400 is not set
 # CONFIG_BOARD_LENOVO_T400 is not set
+# CONFIG_BOARD_LENOVO_T420 is not set
 # CONFIG_BOARD_LENOVO_T420S is not set
 # CONFIG_BOARD_LENOVO_T430S is not set
 # CONFIG_BOARD_LENOVO_T500 is not set
@@ -149,8 +151,6 @@ CONFIG_SEABIOS_PS2_TIMEOUT=3000
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
-# CONFIG_DRIVERS_PS2_KEYBOARD is not set
-CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_NO_POST is not set
 CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
 CONFIG_BOARD_ROMSIZE_KB_2048=y
@@ -164,9 +164,13 @@ CONFIG_COREBOOT_ROMSIZE_KB_2048=y
 # CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=2048
 CONFIG_ROM_SIZE=0x200000
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_FMDFILE=""
+# CONFIG_MAINBOARD_HAS_TPM2 is not set
 CONFIG_SYSTEM_TYPE_LAPTOP=y
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
 
@@ -179,18 +183,26 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 #
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
+CONFIG_ROMSTAGE_ADDR=0x2000000
+CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/i945/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c"
 CONFIG_EHCI_BAR=0xfef00000
+CONFIG_RAMTOP=0x200000
 CONFIG_HEAP_SIZE=0x4000
+CONFIG_CONSOLE_CBMEM=y
+CONFIG_UART_PCI_ADDR=0x0
+CONFIG_HPET_MIN_TICKS=0x80
 # CONFIG_SOC_MARVELL_ARMADA38X is not set
 # CONFIG_SOC_MARVELL_BG4CD is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
+# CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_SOC_ROCKCHIP_RK3288 is not set
+# CONFIG_SOC_ROCKCHIP_RK3399 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
 # CONFIG_SOC_UCB_RISCV is not set
@@ -213,22 +225,23 @@ CONFIG_SSE2=y
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
+# CONFIG_PARALLEL_MP is not set
+# CONFIG_UDELAY_IO is not set
 CONFIG_UDELAY_LAPIC=y
 CONFIG_LAPIC_MONOTONIC_TIMER=y
 # CONFIG_UDELAY_TSC is not set
 # CONFIG_UDELAY_TIMER2 is not set
-# CONFIG_TSC_CALIBRATE_WITH_IO is not set
 # CONFIG_TSC_SYNC_LFENCE is not set
 CONFIG_TSC_SYNC_MFENCE=y
+# CONFIG_NO_FIXED_XIP_ROM_SIZE is not set
 CONFIG_LOGICAL_CPUS=y
 # CONFIG_SMM_TSEG is not set
 CONFIG_SMM_LAPIC_REMAP_MITIGATION=y
 # CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
-# CONFIG_PARALLEL_MP is not set
-# CONFIG_BACKUP_DEFAULT_SMM_REGION is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
@@ -249,6 +262,7 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
 CONFIG_RAMBASE=0x100000
+# CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
 CONFIG_NORTHBRIDGE_INTEL_I945=y
 # CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC is not set
@@ -256,16 +270,7 @@ CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
 CONFIG_CHANNEL_XOR_RANDOMIZATION=y
 # CONFIG_OVERRIDE_CLOCK_DISABLE is not set
 # CONFIG_CHECK_SLFRCS_ON_RESUME is not set
-# CONFIG_VRAM_SIZE_1MB is not set
-# CONFIG_VRAM_SIZE_4MB is not set
-# CONFIG_VRAM_SIZE_8MB is not set
-# CONFIG_VRAM_SIZE_16MB is not set
-# CONFIG_VRAM_SIZE_32MB is not set
-# CONFIG_VRAM_SIZE_48MB is not set
-CONFIG_VRAM_SIZE_64MB=y
-CONFIG_VRAM_SIZE=0x70
 CONFIG_HPET_ADDRESS=0xfed00000
-CONFIG_HPET_MIN_TICKS=0x80
 CONFIG_MAX_PIRQ_LINKS=4
 
 #
@@ -292,8 +297,14 @@ CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
+CONFIG_VBOOT_VBNV_OFFSET=0x26
+# CONFIG_VBOOT_VBNV_CMOS is not set
+# CONFIG_VBOOT_VBNV_EC is not set
+# CONFIG_VBOOT is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 # CONFIG_UEFI_2_4_BINDING is not set
+# CONFIG_UDK_2015_BINDING is not set
+# CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
 # CONFIG_ARCH_VERSTAGE_ARM is not set
@@ -347,17 +358,18 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_USE_MARCH_586 is not set
 CONFIG_AP_IN_SIPI_WAIT=y
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 # CONFIG_ROMCC is not set
 # CONFIG_LATE_CBMEM_INIT is not set
 CONFIG_PC80_SYSTEM=y
+# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
+# CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
 CONFIG_HAVE_CMOS_DEFAULT=y
 CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_COMPILE_IN_DSDT is not set
-CONFIG_ROMSTAGE_ADDR=0x2000000
-CONFIG_VERSTAGE_ADDR=0x2000000
+# CONFIG_POSTCAR_STAGE is not set
+# CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
+# CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
 
 #
 # Devices
@@ -382,7 +394,6 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_PCIEXP_L1_SUB_STATE 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
 
 #
@@ -395,8 +406,31 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 #
 # CONFIG_DRIVERS_AS3722_RTC is not set
 # CONFIG_GIC is not set
+# CONFIG_IPMI_KCS is not set
+CONFIG_DRIVERS_LENOVO_WACOM=y
+# CONFIG_DIGITIZER_AUTODETECT is not set
+CONFIG_DIGITIZER_PRESENT=y
+# CONFIG_DIGITIZER_ABSENT is not set
+# CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
+# CONFIG_REALTEK_8168_RESET is not set
+# CONFIG_SPI_FLASH is not set
+# CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
+# CONFIG_DRIVERS_UART is not set
+# CONFIG_NO_UART_ON_SUPERIO is not set
+# CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
+# CONFIG_UART_OVERRIDE_REFCLK is not set
+# CONFIG_DRIVERS_UART_8250MEM is not set
+# CONFIG_DRIVERS_UART_8250MEM_32 is not set
+# CONFIG_HAVE_UART_SPECIAL is not set
+# CONFIG_DRIVERS_UART_OXPCIE is not set
+# CONFIG_DRIVERS_UART_PL011 is not set
+# CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
+CONFIG_HAVE_USBDEBUG=y
+# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
+# CONFIG_DRIVERS_I2C_PCF8523 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
+# CONFIG_DRIVER_I2C_TPM_ACPI is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
@@ -404,55 +438,38 @@ CONFIG_INTEL_EDID=y
 CONFIG_INTEL_INT15=y
 CONFIG_INTEL_GMA_ACPI=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
-CONFIG_DIGITIZER_PRESENT=y
-# CONFIG_DIGITIZER_ABSENT is not set
+CONFIG_DRIVERS_INTEL_WIFI=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
+# CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
+# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
-# CONFIG_SPI_FLASH is not set
-# CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_UART is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# CONFIG_DRIVERS_UART_8250MEM is not set
-# CONFIG_DRIVERS_UART_8250MEM_32 is not set
-# CONFIG_HAVE_UART_SPECIAL is not set
-# CONFIG_DRIVERS_UART_OXPCIE is not set
-# CONFIG_DRIVERS_UART_PL011 is not set
-CONFIG_HAVE_USBDEBUG=y
-# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
-CONFIG_RTC=y
+# CONFIG_ACPI_SATA_GENERATOR is not set
+CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
+# CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
+CONFIG_BOOT_DEVICE_SPI_FLASH=y
+CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
+# CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
+# CONFIG_RTC is not set
 # CONFIG_TPM is not set
 CONFIG_STACK_SIZE=0x1000
 CONFIG_MMCONF_SUPPORT_DEFAULT=y
 CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
 
 #
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_CONSOLE_SERIAL is not set
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# 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_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
-CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
@@ -465,7 +482,6 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 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
@@ -506,6 +522,7 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
@@ -514,10 +531,17 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_TIANOCORE is not set
 CONFIG_PAYLOAD_FILE="payload.elf"
 CONFIG_PAYLOAD_OPTIONS=""
+# CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
+
+#
+# Secondary Payloads
+#
 # CONFIG_COREINFO_SECONDARY_PAYLOAD is not set
 # CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
+# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
+# CONFIG_TINT_SECONDARY_PAYLOAD is not set
 
 #
 # Debugging
@@ -534,6 +558,7 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_TRACE is not set
+# CONFIG_DEBUG_BOOT_STATE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 CONFIG_IASL_WARNINGS_ARE_ERRORS=y
@@ -543,4 +568,5 @@ CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
 # CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
 # CONFIG_REG_SCRIPT is not set
-# CONFIG_DEBUG_BOOT_STATE is not set
+# CONFIG_CREATE_BOARD_CHECKLIST is not set
+# CONFIG_MAKE_CHECKLIST_PUBLIC is not set