Update coreboot (kgpe-d16,kcma-d8,kfsn4-dre,d510mo,ga-g41m-es2l)

Update to the latest coreboot and vboot versions at the time of writing:
coreboot 2a3434757ef425dbdfedf1fc69e1a033a6e7310d
vboot d187cd3fc792f8bcefbee4587c83eafbd08441fc

15 files changed, 230 insertions, 104 deletions

diff --git a/resources/libreboot/config/grub/d510mo/cbrevision b/resources/libreboot/config/grub/d510mo/cbrevision
index 4a7b3f04..1ab8299e 100644
--- a/resources/libreboot/config/grub/d510mo/cbrevision
+++ b/resources/libreboot/config/grub/d510mo/cbrevision
@@ -1 +1 @@
-721ee01bb0668d2ea207048a11c339313ed248f5
+2a3434757ef425dbdfedf1fc69e1a033a6e7310d
diff --git a/resources/libreboot/config/grub/d510mo/config b/resources/libreboot/config/grub/d510mo/config
index 88499b1b..230ac99c 100644
--- a/resources/libreboot/config/grub/d510mo/config
+++ b/resources/libreboot/config/grub/d510mo/config
@@ -17,10 +17,10 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_SCONFIG_GENPARSER is not set
 # CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
+# CONFIG_COMPRESS_PRERAM_STAGES is not set
 CONFIG_INCLUDE_CONFIG_FILE=y
 # CONFIG_EARLY_CBMEM_INIT is not set
 # CONFIG_COLLECT_TIMESTAMPS is not set
-CONFIG_HAS_PRECBMEM_TIMESTAMP_REGION=y
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
 # CONFIG_RELOCATABLE_MODULES is not set
@@ -120,21 +120,19 @@ CONFIG_DCACHE_RAM_BASE=0xffafc000
 CONFIG_DCACHE_RAM_SIZE=0x4000
 CONFIG_MMCONF_BASE_ADDRESS=0xe0000000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Intel"
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+CONFIG_POST_IO=y
 CONFIG_MAX_REBOOT_CNT=3
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
-# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
-# CONFIG_BOARD_EMULATION_QEMU_UCB_RISCV is not set
-# CONFIG_BOARD_EMULATION_SPIKE_UCB_RISCV is not set
 CONFIG_RAMTOP=0x200000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x100000
 CONFIG_POST_DEVICE=y
 CONFIG_USBDEBUG_HCD_INDEX=0
 CONFIG_TTYS0_LCS=3
+# CONFIG_BOARD_INTEL_APOLLOLAKE_RVP1 is not set
+# CONFIG_BOARD_INTEL_APOLLOLAKE_RVP2 is not set
 # CONFIG_BOARD_INTEL_BAKERSPORT_FSP is not set
 # CONFIG_BOARD_INTEL_BASKING_RIDGE is not set
 # CONFIG_BOARD_INTEL_BAYLEYBAY_FSP is not set
@@ -144,6 +142,7 @@ CONFIG_BOARD_INTEL_D510MO=y
 # CONFIG_BOARD_INTEL_D945GCLF is not set
 # CONFIG_BOARD_INTEL_EAGLEHEIGHTS is not set
 # CONFIG_BOARD_INTEL_EMERALDLAKE2 is not set
+# CONFIG_BOARD_INTEL_GALILEO is not set
 # CONFIG_BOARD_INTEL_KUNIMITSU is not set
 # CONFIG_BOARD_INTEL_LITTLEPLAINS is not set
 # CONFIG_BOARD_INTEL_MINNOWMAX is not set
@@ -185,11 +184,13 @@ CONFIG_FMDFILE=""
 # SoC
 #
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/pineview/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c"
 CONFIG_TTYS0_BASE=0x3f8
 CONFIG_EHCI_BAR=0xfef00000
 CONFIG_HEAP_SIZE=0x4000
+# 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
@@ -267,6 +268,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_I82801GX=y
 
 #
@@ -311,6 +313,11 @@ CONFIG_SUPERIO_WINBOND_W83627THG=y
 # CONFIG_ARCH_VERSTAGE_MIPS is not set
 # CONFIG_ARCH_ROMSTAGE_MIPS is not set
 # CONFIG_ARCH_RAMSTAGE_MIPS is not set
+# CONFIG_ARCH_POWER8 is not set
+# CONFIG_ARCH_BOOTBLOCK_POWER8 is not set
+# CONFIG_ARCH_VERSTAGE_POWER8 is not set
+# CONFIG_ARCH_ROMSTAGE_POWER8 is not set
+# CONFIG_ARCH_RAMSTAGE_POWER8 is not set
 # CONFIG_ARCH_RISCV is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
@@ -325,8 +332,10 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_ARCH_VERSTAGE_X86_64 is not set
 # CONFIG_ARCH_ROMSTAGE_X86_64 is not set
 # CONFIG_ARCH_RAMSTAGE_X86_64 is not set
+# CONFIG_USE_MARCH_586 is not set
 CONFIG_AP_IN_SIPI_WAIT=y
 CONFIG_SIPI_VECTOR_IN_ROM=y
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 # CONFIG_ROMCC is not set
 CONFIG_LATE_CBMEM_INIT=y
 CONFIG_PC80_SYSTEM=y
@@ -334,6 +343,8 @@ CONFIG_PC80_SYSTEM=y
 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
 
 #
 # Devices
@@ -341,7 +352,7 @@ CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
 CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 # CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG is not set
-# CONFIG_ON_DEVICE_ROM_RUN is not set
+CONFIG_ON_DEVICE_ROM_LOAD=y
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
 # CONFIG_SPD_CACHE is not set
@@ -427,6 +438,9 @@ CONFIG_CONSOLE_SERIAL=y
 #
 # Serial port base address = 0x3f8
 #
+# 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=y
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
@@ -452,7 +466,6 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
-CONFIG_POST_IO=y
 CONFIG_POST_IO_PORT=0x80
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
 # CONFIG_HAVE_ACPI_RESUME is not set
@@ -491,12 +504,15 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
+# CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
+CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
+# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
+# CONFIG_COREINFO_SECONDARY_PAYLOAD is not set
+# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
 
 #
 # Debugging
@@ -523,3 +539,4 @@ 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
diff --git a/resources/libreboot/config/grub/d510mo/vbootrevision b/resources/libreboot/config/grub/d510mo/vbootrevision
index 074840e2..c18bc860 100644
--- a/resources/libreboot/config/grub/d510mo/vbootrevision
+++ b/resources/libreboot/config/grub/d510mo/vbootrevision
@@ -1 +1 @@
-d6723ed12b429834c2627c009aab58f0db20ce73
+d187cd3fc792f8bcefbee4587c83eafbd08441fc
diff --git a/resources/libreboot/config/grub/ga-g41m-es2l/cbrevision b/resources/libreboot/config/grub/ga-g41m-es2l/cbrevision
index c11dcf64..1ab8299e 100644
--- a/resources/libreboot/config/grub/ga-g41m-es2l/cbrevision
+++ b/resources/libreboot/config/grub/ga-g41m-es2l/cbrevision
@@ -1 +1 @@
-a9f62359e2cf676104c64e9119ca82bd589305d9
+2a3434757ef425dbdfedf1fc69e1a033a6e7310d
diff --git a/resources/libreboot/config/grub/ga-g41m-es2l/config b/resources/libreboot/config/grub/ga-g41m-es2l/config
index 6b623d7d..1d95c908 100644
--- a/resources/libreboot/config/grub/ga-g41m-es2l/config
+++ b/resources/libreboot/config/grub/ga-g41m-es2l/config
@@ -17,18 +17,20 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_SCONFIG_GENPARSER is not set
 # CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
+# CONFIG_COMPRESS_PRERAM_STAGES is not set
 CONFIG_INCLUDE_CONFIG_FILE=y
-# CONFIG_EARLY_CBMEM_INIT is not set
+CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
-CONFIG_HAS_PRECBMEM_TIMESTAMP_REGION=y
 # 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=0
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_CUSTOM=y
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
 # CONFIG_UPDATE_IMAGE is not set
 # CONFIG_GENERIC_GPIO_LIB is not set
 # CONFIG_BOARD_ID_AUTO is not set
@@ -89,6 +91,7 @@ CONFIG_VENDOR_GIGABYTE=y
 # CONFIG_VENDOR_NVIDIA is not set
 # CONFIG_VENDOR_PACKARDBELL is not set
 # CONFIG_VENDOR_PCENGINES is not set
+# CONFIG_VENDOR_PURISM is not set
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
@@ -116,17 +119,13 @@ CONFIG_VGA_BIOS_ID="8086,2e32"
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
 CONFIG_DCACHE_RAM_BASE=0xfeffc000
 CONFIG_DCACHE_RAM_SIZE=0x4000
-CONFIG_MMCONF_BASE_ADDRESS=0xc0000000
+CONFIG_MMCONF_BASE_ADDRESS=0xe0000000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="GIGABYTE"
-CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
+CONFIG_POST_IO=y
 CONFIG_MAX_REBOOT_CNT=3
+CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
-# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
-# CONFIG_BOARD_EMULATION_QEMU_UCB_RISCV is not set
-# CONFIG_BOARD_EMULATION_SPIKE_UCB_RISCV is not set
 CONFIG_RAMTOP=0x200000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x100000
@@ -148,6 +147,8 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_USBDEBUG=y
 CONFIG_MAINBOARD_VERSION="1.0"
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
+CONFIG_DRIVERS_UART_8250IO=y
+# CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_1024=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
@@ -163,6 +164,7 @@ CONFIG_COREBOOT_ROMSIZE_KB=1024
 CONFIG_ROM_SIZE=0x100000
 CONFIG_FMDFILE=""
 # CONFIG_SYSTEM_TYPE_LAPTOP is not set
+# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
 
 #
 # Chipset
@@ -172,11 +174,13 @@ CONFIG_FMDFILE=""
 # SoC
 #
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/x4x/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c"
 CONFIG_TTYS0_BASE=0x3f8
 CONFIG_EHCI_BAR=0xfef00000
 CONFIG_HEAP_SIZE=0x4000
+# 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
@@ -258,6 +262,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_I82801GX=y
 
 #
@@ -302,6 +307,11 @@ CONFIG_SUPERIO_ITE_IT8718F=y
 # CONFIG_ARCH_VERSTAGE_MIPS is not set
 # CONFIG_ARCH_ROMSTAGE_MIPS is not set
 # CONFIG_ARCH_RAMSTAGE_MIPS is not set
+# CONFIG_ARCH_POWER8 is not set
+# CONFIG_ARCH_BOOTBLOCK_POWER8 is not set
+# CONFIG_ARCH_VERSTAGE_POWER8 is not set
+# CONFIG_ARCH_ROMSTAGE_POWER8 is not set
+# CONFIG_ARCH_RAMSTAGE_POWER8 is not set
 # CONFIG_ARCH_RISCV is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
@@ -316,15 +326,19 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_ARCH_VERSTAGE_X86_64 is not set
 # CONFIG_ARCH_ROMSTAGE_X86_64 is not set
 # CONFIG_ARCH_RAMSTAGE_X86_64 is not set
+# CONFIG_USE_MARCH_586 is not set
 CONFIG_AP_IN_SIPI_WAIT=y
 CONFIG_SIPI_VECTOR_IN_ROM=y
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 # CONFIG_ROMCC is not set
-CONFIG_LATE_CBMEM_INIT=y
+# CONFIG_LATE_CBMEM_INIT is not set
 CONFIG_PC80_SYSTEM=y
 # CONFIG_HAVE_CMOS_DEFAULT is not set
 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
 
 #
 # Devices
@@ -332,7 +346,7 @@ CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
 CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 # CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG is not set
-CONFIG_ON_DEVICE_ROM_RUN=y
+CONFIG_ON_DEVICE_ROM_LOAD=y
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
 # CONFIG_SPD_CACHE is not set
@@ -383,7 +397,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
 CONFIG_DRIVERS_UART=y
-CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_DRIVERS_UART_8250MEM_32 is not set
@@ -392,6 +405,7 @@ CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_DRIVERS_UART_PL011 is not set
 CONFIG_HAVE_USBDEBUG=y
 # CONFIG_HAVE_USBDEBUG_OPTIONS is not set
+CONFIG_USBDEBUG_IN_ROMSTAGE=y
 CONFIG_USBDEBUG_DEFAULT_PORT=0
 CONFIG_USBDEBUG_DONGLE_STD=y
 # CONFIG_USBDEBUG_DONGLE_BEAGLEBONE is not set
@@ -419,6 +433,9 @@ CONFIG_CONSOLE_SERIAL=y
 #
 # Serial port base address = 0x3f8
 #
+# 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=y
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
@@ -439,19 +456,18 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_2 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
-# CONFIG_NO_POST is not set
 # CONFIG_CMOS_POST is not set
 # CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
-CONFIG_POST_IO=y
 CONFIG_POST_IO_PORT=0x80
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
 # CONFIG_HAVE_ACPI_RESUME is not set
 CONFIG_HAVE_HARD_RESET=y
 # CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
 # 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_PIRQ_ROUTE is not set
@@ -463,6 +479,7 @@ CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_COMMON_FADT=y
+# CONFIG_ACPI_NHLT is not set
 
 #
 # System tables
@@ -480,12 +497,15 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
+# CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
+CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
+# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
+# CONFIG_COREINFO_SECONDARY_PAYLOAD is not set
+# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
 
 #
 # Debugging
@@ -512,3 +532,4 @@ 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
diff --git a/resources/libreboot/config/grub/ga-g41m-es2l/vbootrevision b/resources/libreboot/config/grub/ga-g41m-es2l/vbootrevision
index 074840e2..c18bc860 100644
--- a/resources/libreboot/config/grub/ga-g41m-es2l/vbootrevision
+++ b/resources/libreboot/config/grub/ga-g41m-es2l/vbootrevision
@@ -1 +1 @@
-d6723ed12b429834c2627c009aab58f0db20ce73
+d187cd3fc792f8bcefbee4587c83eafbd08441fc
diff --git a/resources/libreboot/config/grub/kcma-d8/cbrevision b/resources/libreboot/config/grub/kcma-d8/cbrevision
index 832f0cc6..1ab8299e 100644
--- a/resources/libreboot/config/grub/kcma-d8/cbrevision
+++ b/resources/libreboot/config/grub/kcma-d8/cbrevision
@@ -1 +1 @@
-369b561315ca68d0cdedc38208105a513c7139b5
+2a3434757ef425dbdfedf1fc69e1a033a6e7310d
diff --git a/resources/libreboot/config/grub/kcma-d8/config b/resources/libreboot/config/grub/kcma-d8/config
index b98f9813..20f88b5d 100644
--- a/resources/libreboot/config/grub/kcma-d8/config
+++ b/resources/libreboot/config/grub/kcma-d8/config
@@ -18,10 +18,10 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_USE_OPTION_TABLE is not set
 # CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
+# CONFIG_COMPRESS_PRERAM_STAGES is not set
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
-CONFIG_HAS_PRECBMEM_TIMESTAMP_REGION=y
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
 # CONFIG_RELOCATABLE_MODULES is not set
@@ -31,6 +31,7 @@ CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_CUSTOM=y
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
 # CONFIG_UPDATE_IMAGE is not set
 # CONFIG_GENERIC_GPIO_LIB is not set
 # CONFIG_BOARD_ID_AUTO is not set
@@ -91,6 +92,7 @@ CONFIG_VENDOR_ASUS=y
 # CONFIG_VENDOR_NVIDIA is not set
 # CONFIG_VENDOR_PACKARDBELL is not set
 # CONFIG_VENDOR_PCENGINES is not set
+# CONFIG_VENDOR_PURISM is not set
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
@@ -153,6 +155,7 @@ CONFIG_BOARD_ASUS_KCMA_D8=y
 # CONFIG_BOARD_ASUS_P2B_LS is not set
 # CONFIG_BOARD_ASUS_P2B is not set
 # CONFIG_BOARD_ASUS_P3B_F is not set
+CONFIG_POST_IO=y
 CONFIG_AGP_APERTURE_SIZE=0x4000000
 CONFIG_BOOTBLOCK_MAINBOARD_INIT="mainboard/asus/kcma-d8/bootblock.c"
 CONFIG_SOUTHBRIDGE_AMD_SB700_SATA_PORT_COUNT_BITFIELD=0x3f
@@ -160,11 +163,6 @@ CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL=y
 CONFIG_MAX_REBOOT_CNT=10
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
-# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
-# CONFIG_BOARD_EMULATION_QEMU_UCB_RISCV is not set
-# CONFIG_BOARD_EMULATION_SPIKE_UCB_RISCV is not set
 CONFIG_RAMTOP=0x400000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
@@ -178,6 +176,8 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_USBDEBUG=y
 CONFIG_MAINBOARD_VERSION="1.0"
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
+CONFIG_DRIVERS_UART_8250IO=y
+# CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_2048=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
@@ -191,7 +191,9 @@ CONFIG_COREBOOT_ROMSIZE_KB_2048=y
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=2048
 CONFIG_ROM_SIZE=0x200000
+CONFIG_FMDFILE=""
 # CONFIG_SYSTEM_TYPE_LAPTOP is not set
+# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
 
 #
 # Chipset
@@ -201,11 +203,14 @@ CONFIG_ROM_SIZE=0x200000
 # SoC
 #
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
+CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/amd/amdfam10/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/amd/sb700/bootblock.c"
 CONFIG_TTYS0_BASE=0x3f8
 CONFIG_EHCI_BAR=0xfef00000
 CONFIG_HEAP_SIZE=0xc0000
+# 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
@@ -221,7 +226,6 @@ CONFIG_HEAP_SIZE=0xc0000
 # CPU
 #
 # CONFIG_CPU_ALLWINNER_A10 is not set
-CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
 CONFIG_DCACHE_BSP_STACK_SLUSH=0x4000
 CONFIG_DCACHE_AP_STACK_SIZE=0x500
 CONFIG_CPU_SOCKET_TYPE=0x14
@@ -276,7 +280,6 @@ CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
 # CONFIG_CPU_MICROCODE_CBFS_GENERATE is not set
 # CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
 CONFIG_CPU_MICROCODE_CBFS_NONE=y
-CONFIG_CPU_MICROCODE_MULTIPLE_FILES=y
 
 #
 # Northbridge
@@ -322,6 +325,7 @@ CONFIG_SOUTHBRIDGE_AMD_SUBTYPE_SP5100=y
 CONFIG_SOUTHBRIDGE_AMD_SB700_DISABLE_ISA_DMA=y
 CONFIG_SOUTHBRIDGE_AMD_SR5650=y
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
 
 #
 # Super I/O
@@ -365,6 +369,11 @@ CONFIG_SUPERIO_WINBOND_W83667HG_A=y
 # CONFIG_ARCH_VERSTAGE_MIPS is not set
 # CONFIG_ARCH_ROMSTAGE_MIPS is not set
 # CONFIG_ARCH_RAMSTAGE_MIPS is not set
+# CONFIG_ARCH_POWER8 is not set
+# CONFIG_ARCH_BOOTBLOCK_POWER8 is not set
+# CONFIG_ARCH_VERSTAGE_POWER8 is not set
+# CONFIG_ARCH_ROMSTAGE_POWER8 is not set
+# CONFIG_ARCH_RAMSTAGE_POWER8 is not set
 # CONFIG_ARCH_RISCV is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
@@ -379,8 +388,10 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_ARCH_VERSTAGE_X86_64 is not set
 # CONFIG_ARCH_ROMSTAGE_X86_64 is not set
 # CONFIG_ARCH_RAMSTAGE_X86_64 is not set
+# CONFIG_USE_MARCH_586 is not set
 # CONFIG_AP_IN_SIPI_WAIT is not set
 # 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
@@ -389,6 +400,8 @@ 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
 
 #
 # Devices
@@ -397,9 +410,7 @@ CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 # CONFIG_VGA_ROM_RUN is not set
-# CONFIG_ON_DEVICE_ROM_RUN is not set
-# CONFIG_PCI_OPTION_ROM_RUN_REALMODE is not set
-# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set
+CONFIG_ON_DEVICE_ROM_LOAD=y
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 CONFIG_SMBUS_HAS_AUX_CHANNELS=y
 # CONFIG_SPD_CACHE is not set
@@ -465,7 +476,6 @@ CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
 CONFIG_DRIVERS_UART=y
-CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_DRIVERS_UART_8250MEM_32 is not set
@@ -502,6 +512,9 @@ CONFIG_CONSOLE_SERIAL=y
 #
 # Serial port base address = 0x3f8
 #
+# 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=y
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
@@ -522,16 +535,15 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_2 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
-# CONFIG_NO_POST is not set
 # CONFIG_CMOS_POST is not set
 # CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
-CONFIG_POST_IO=y
 CONFIG_POST_IO_PORT=0x80
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
 CONFIG_HAVE_ACPI_RESUME=y
+CONFIG_RESUME_PATH_SAME_AS_BOOT=y
 CONFIG_HAVE_HARD_RESET=y
 CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK=y
 CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK=y
@@ -551,6 +563,7 @@ CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
 CONFIG_HAVE_PIRQ_TABLE=y
 # CONFIG_COMMON_FADT is not set
+# CONFIG_ACPI_NHLT is not set
 
 #
 # System tables
@@ -568,12 +581,15 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
+# CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
+CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
+# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
+# CONFIG_COREINFO_SECONDARY_PAYLOAD is not set
+# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
 
 #
 # Debugging
@@ -602,3 +618,4 @@ 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
diff --git a/resources/libreboot/config/grub/kcma-d8/vbootrevision b/resources/libreboot/config/grub/kcma-d8/vbootrevision
index 074840e2..c18bc860 100644
--- a/resources/libreboot/config/grub/kcma-d8/vbootrevision
+++ b/resources/libreboot/config/grub/kcma-d8/vbootrevision
@@ -1 +1 @@
-d6723ed12b429834c2627c009aab58f0db20ce73
+d187cd3fc792f8bcefbee4587c83eafbd08441fc
diff --git a/resources/libreboot/config/grub/kfsn4-dre/cbrevision b/resources/libreboot/config/grub/kfsn4-dre/cbrevision
index 5c2d6062..1ab8299e 100644
--- a/resources/libreboot/config/grub/kfsn4-dre/cbrevision
+++ b/resources/libreboot/config/grub/kfsn4-dre/cbrevision
@@ -1 +1 @@
-33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f
+2a3434757ef425dbdfedf1fc69e1a033a6e7310d
diff --git a/resources/libreboot/config/grub/kfsn4-dre/config b/resources/libreboot/config/grub/kfsn4-dre/config
index 23734498..8f29244e 100644
--- a/resources/libreboot/config/grub/kfsn4-dre/config
+++ b/resources/libreboot/config/grub/kfsn4-dre/config
@@ -19,6 +19,7 @@ CONFIG_USE_OPTION_TABLE=y
 # CONFIG_STATIC_OPTION_TABLE is not set
 # CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
+# CONFIG_COMPRESS_PRERAM_STAGES is not set
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
@@ -29,13 +30,15 @@ CONFIG_EARLY_CBMEM_INIT=y
 CONFIG_FLASHMAP_OFFSET=0
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_CUSTOM=y
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
-# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
+# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
 # CONFIG_UPDATE_IMAGE is not set
 # CONFIG_GENERIC_GPIO_LIB is not set
 # CONFIG_BOARD_ID_AUTO is not set
 # 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
 
 #
@@ -49,7 +52,6 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_AMD is not set
 # CONFIG_VENDOR_AOPEN is not set
 # CONFIG_VENDOR_APPLE is not set
-# CONFIG_VENDOR_ARIMA is not set
 # CONFIG_VENDOR_ARTECGROUP is not set
 # CONFIG_VENDOR_ASROCK is not set
 CONFIG_VENDOR_ASUS=y
@@ -67,13 +69,13 @@ CONFIG_VENDOR_ASUS=y
 # CONFIG_VENDOR_DMP is not set
 # CONFIG_VENDOR_ECS is not set
 # CONFIG_VENDOR_EMULATION is not set
+# CONFIG_VENDOR_ESD is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GIZMOSPHERE is not set
 # CONFIG_VENDOR_GOOGLE is not set
 # CONFIG_VENDOR_HP is not set
 # CONFIG_VENDOR_IBASE is not set
-# CONFIG_VENDOR_IBM is not set
 # CONFIG_VENDOR_IEI is not set
 # CONFIG_VENDOR_INTEL is not set
 # CONFIG_VENDOR_IWAVE is not set
@@ -87,11 +89,11 @@ CONFIG_VENDOR_ASUS=y
 # CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_NEC is not set
-# CONFIG_VENDOR_NEWISYS is not set
 # CONFIG_VENDOR_NOKIA is not set
 # CONFIG_VENDOR_NVIDIA is not set
 # CONFIG_VENDOR_PACKARDBELL is not set
 # CONFIG_VENDOR_PCENGINES is not set
+# CONFIG_VENDOR_PURISM is not set
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
@@ -135,7 +137,9 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS"
 # CONFIG_BOARD_ASUS_F2A85_M is not set
 # CONFIG_BOARD_ASUS_F2A85_M_LE is not set
 # CONFIG_BOARD_ASUS_K8V_X is not set
+# CONFIG_BOARD_ASUS_KCMA_D8 is not set
 CONFIG_BOARD_ASUS_KFSN4_DRE=y
+# CONFIG_BOARD_ASUS_KFSN4_DRE_K8 is not set
 # CONFIG_BOARD_ASUS_KGPE_D16 is not set
 # CONFIG_BOARD_ASUS_M2N_E is not set
 # CONFIG_BOARD_ASUS_M2V_MX_SE is not set
@@ -152,26 +156,30 @@ CONFIG_BOARD_ASUS_KFSN4_DRE=y
 # CONFIG_BOARD_ASUS_P2B_LS is not set
 # CONFIG_BOARD_ASUS_P2B is not set
 # CONFIG_BOARD_ASUS_P3B_F is not set
+CONFIG_POST_IO=y
 CONFIG_AGP_APERTURE_SIZE=0x4000000
 CONFIG_BOOTBLOCK_MAINBOARD_INIT="mainboard/asus/kfsn4-dre/bootblock.c"
+CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL=y
+CONFIG_MAX_REBOOT_CNT=10
 CONFIG_CK804_PCI_E_X=1
 CONFIG_CK804_PCIE_PME_WAKE=y
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
-CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL=y
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x400000
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_CBFS_SIZE=0x100000
+CONFIG_POST_DEVICE=y
 CONFIG_USBDEBUG_HCD_INDEX=0
 CONFIG_TTYS0_LCS=3
-CONFIG_CBFS_SIZE=0x100000
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_UDELAY_LAPIC_FIXED_FSB=200
-CONFIG_POST_DEVICE=y
 CONFIG_CPU_ADDR_BITS=48
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_USBDEBUG=y
 CONFIG_MAINBOARD_VERSION="1.0"
 CONFIG_DRIVERS_PS2_KEYBOARD=y
+CONFIG_DRIVERS_UART_8250IO=y
+# CONFIG_NO_POST is not set
 CONFIG_CK804_NUM=1
 CONFIG_BOARD_ROMSIZE_KB_1024=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -186,7 +194,9 @@ CONFIG_COREBOOT_ROMSIZE_KB_1024=y
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=1024
 CONFIG_ROM_SIZE=0x100000
+CONFIG_FMDFILE=""
 # CONFIG_SYSTEM_TYPE_LAPTOP is not set
+# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
 
 #
 # Chipset
@@ -196,13 +206,16 @@ CONFIG_ROM_SIZE=0x100000
 # SoC
 #
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
-CONFIG_CHIPSET_BOOTBLOCK_INCLUDE="southbridge/nvidia/ck804/romstrap.inc"
+CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
+CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/amd/amdfam10/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/nvidia/ck804/bootblock.c"
 CONFIG_TTYS0_BASE=0x3f8
 CONFIG_EHCI_BAR=0xfef00000
 CONFIG_HEAP_SIZE=0xc0000
+# 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
@@ -216,9 +229,8 @@ CONFIG_HEAP_SIZE=0xc0000
 # CPU
 #
 # CONFIG_CPU_ALLWINNER_A10 is not set
-CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
 CONFIG_DCACHE_BSP_STACK_SLUSH=0x1000
-CONFIG_DCACHE_AP_STACK_SIZE=0x400
+CONFIG_DCACHE_AP_STACK_SIZE=0x500
 CONFIG_CPU_SOCKET_TYPE=0x10
 # CONFIG_EXT_RT_TBL_SUPPORT is not set
 CONFIG_CBB=0x0
@@ -252,6 +264,8 @@ CONFIG_TSC_SYNC_LFENCE=y
 # CONFIG_TSC_SYNC_MFENCE is not set
 CONFIG_LOGICAL_CPUS=y
 # CONFIG_SMM_TSEG is not set
+# CONFIG_SMM_LAPIC_REMAP_MITIGATION is not set
+# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
 CONFIG_X86_AMD_FIXED_MTRRS=y
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_PARALLEL_MP is not set
@@ -262,8 +276,9 @@ CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 CONFIG_SSE=y
 CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
+# CONFIG_USES_MICROCODE_HEADER_FILES is not set
 # CONFIG_CPU_MICROCODE_CBFS_GENERATE is not set
-# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL is not set
+# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
 CONFIG_CPU_MICROCODE_CBFS_NONE=y
 
 #
@@ -304,6 +319,7 @@ CONFIG_MAX_PIRQ_LINKS=4
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
 CONFIG_SOUTHBRIDGE_NVIDIA_CK804=y
 # CONFIG_CK804_USE_NIC is not set
 # CONFIG_CK804_USE_ACI is not set
@@ -335,7 +351,6 @@ CONFIG_SUPERIO_WINBOND_W83627THG=y
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
 # CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
-# CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
@@ -346,19 +361,22 @@ CONFIG_SUPERIO_WINBOND_W83627THG=y
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
-# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARM64_A53_ERRATUM_843419 is not set
 # CONFIG_ARCH_MIPS is not set
 # CONFIG_ARCH_BOOTBLOCK_MIPS is not set
 # CONFIG_ARCH_VERSTAGE_MIPS is not set
 # CONFIG_ARCH_ROMSTAGE_MIPS is not set
 # CONFIG_ARCH_RAMSTAGE_MIPS is not set
+# CONFIG_ARCH_POWER8 is not set
+# CONFIG_ARCH_BOOTBLOCK_POWER8 is not set
+# CONFIG_ARCH_VERSTAGE_POWER8 is not set
+# CONFIG_ARCH_ROMSTAGE_POWER8 is not set
+# CONFIG_ARCH_RAMSTAGE_POWER8 is not set
 # CONFIG_ARCH_RISCV is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
-# CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
 CONFIG_ARCH_X86=y
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -368,8 +386,10 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_ARCH_VERSTAGE_X86_64 is not set
 # CONFIG_ARCH_ROMSTAGE_X86_64 is not set
 # CONFIG_ARCH_RAMSTAGE_X86_64 is not set
+# CONFIG_USE_MARCH_586 is not set
 # CONFIG_AP_IN_SIPI_WAIT is not set
 # 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
@@ -378,6 +398,8 @@ 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
 
 #
 # Devices
@@ -385,7 +407,7 @@ CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
 # CONFIG_NATIVE_VGA_INIT_USE_EDID is not set
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
-# CONFIG_ON_DEVICE_ROM_RUN is not set
+CONFIG_ON_DEVICE_ROM_LOAD=y
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
 # CONFIG_SPD_CACHE is not set
@@ -395,11 +417,11 @@ CONFIG_PCIX_PLUGIN_SUPPORT=y
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_CLK_PM is not set
+CONFIG_PCIEXP_COMMON_CLOCK=y
+CONFIG_PCIEXP_ASPM=y
+CONFIG_PCIEXP_CLK_PM=y
 # CONFIG_EARLY_PCI_BRIDGE is not set
-# CONFIG_PCIEXP_L1_SUB_STATE is not set
+CONFIG_PCIEXP_L1_SUB_STATE=y
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
@@ -439,7 +461,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
 CONFIG_DRIVERS_UART=y
-CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_DRIVERS_UART_8250MEM_32 is not set
@@ -474,6 +495,13 @@ CONFIG_CONSOLE_SERIAL=y
 #
 # I/O mapped, 8250-compatible
 #
+
+#
+# Serial port base address = 0x3f8
+#
+# 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=y
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
@@ -494,14 +522,13 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_2 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
-# CONFIG_NO_POST is not set
 # CONFIG_CMOS_POST is not set
 # CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
-CONFIG_POST_IO=y
 CONFIG_POST_IO_PORT=0x80
+# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
 # CONFIG_HAVE_ACPI_RESUME is not set
 CONFIG_HAVE_HARD_RESET=y
 # CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
@@ -522,6 +549,7 @@ CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
 CONFIG_HAVE_PIRQ_TABLE=y
 # CONFIG_COMMON_FADT is not set
+# CONFIG_ACPI_NHLT is not set
 
 #
 # System tables
@@ -539,10 +567,15 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
+# CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
+CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
+# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
+# CONFIG_COREINFO_SECONDARY_PAYLOAD is not set
+# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
 
 #
 # Debugging
@@ -563,10 +596,11 @@ CONFIG_HAVE_DEBUG_SMBUS=y
 # CONFIG_TRACE is not set
 CONFIG_ENABLE_APIC_EXT_ID=y
 CONFIG_WARNINGS_ARE_ERRORS=y
+CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
 # CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
 # CONFIG_REG_SCRIPT is not set
-CONFIG_MAX_REBOOT_CNT=3
+# CONFIG_DEBUG_BOOT_STATE is not set
diff --git a/resources/libreboot/config/grub/kfsn4-dre/vbootrevision b/resources/libreboot/config/grub/kfsn4-dre/vbootrevision
index 1e02412a..c18bc860 100644
--- a/resources/libreboot/config/grub/kfsn4-dre/vbootrevision
+++ b/resources/libreboot/config/grub/kfsn4-dre/vbootrevision
@@ -1 +1 @@
-fbf631c845c08299f0bcbae3f311c5807d34c0d6
+d187cd3fc792f8bcefbee4587c83eafbd08441fc
diff --git a/resources/libreboot/config/grub/kgpe-d16/cbrevision b/resources/libreboot/config/grub/kgpe-d16/cbrevision
index 5c2d6062..1ab8299e 100644
--- a/resources/libreboot/config/grub/kgpe-d16/cbrevision
+++ b/resources/libreboot/config/grub/kgpe-d16/cbrevision
@@ -1 +1 @@
-33fb4cf0ffb01be8bcb6b488872c87eb50e7d77f
+2a3434757ef425dbdfedf1fc69e1a033a6e7310d
diff --git a/resources/libreboot/config/grub/kgpe-d16/config b/resources/libreboot/config/grub/kgpe-d16/config
index fd57e177..05f1daf8 100644
--- a/resources/libreboot/config/grub/kgpe-d16/config
+++ b/resources/libreboot/config/grub/kgpe-d16/config
@@ -18,6 +18,7 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_USE_OPTION_TABLE is not set
 # CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
+# CONFIG_COMPRESS_PRERAM_STAGES is not set
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
@@ -28,13 +29,15 @@ CONFIG_EARLY_CBMEM_INIT=y
 CONFIG_FLASHMAP_OFFSET=0
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
+CONFIG_BOOTBLOCK_CUSTOM=y
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
-# CONFIG_SKIP_MAX_REBOOT_CNT_CLEAR is not set
+# CONFIG_C_ENVIRONMENT_BOOTBLOCK is not set
 # CONFIG_UPDATE_IMAGE is not set
 # CONFIG_GENERIC_GPIO_LIB is not set
 # CONFIG_BOARD_ID_AUTO is not set
 # 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
 
 #
@@ -48,7 +51,6 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_VENDOR_AMD is not set
 # CONFIG_VENDOR_AOPEN is not set
 # CONFIG_VENDOR_APPLE is not set
-# CONFIG_VENDOR_ARIMA is not set
 # CONFIG_VENDOR_ARTECGROUP is not set
 # CONFIG_VENDOR_ASROCK is not set
 CONFIG_VENDOR_ASUS=y
@@ -66,13 +68,13 @@ CONFIG_VENDOR_ASUS=y
 # CONFIG_VENDOR_DMP is not set
 # CONFIG_VENDOR_ECS is not set
 # CONFIG_VENDOR_EMULATION is not set
+# CONFIG_VENDOR_ESD is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
 # CONFIG_VENDOR_GIZMOSPHERE is not set
 # CONFIG_VENDOR_GOOGLE is not set
 # CONFIG_VENDOR_HP is not set
 # CONFIG_VENDOR_IBASE is not set
-# CONFIG_VENDOR_IBM is not set
 # CONFIG_VENDOR_IEI is not set
 # CONFIG_VENDOR_INTEL is not set
 # CONFIG_VENDOR_IWAVE is not set
@@ -86,11 +88,11 @@ CONFIG_VENDOR_ASUS=y
 # CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_NEC is not set
-# CONFIG_VENDOR_NEWISYS is not set
 # CONFIG_VENDOR_NOKIA is not set
 # CONFIG_VENDOR_NVIDIA is not set
 # CONFIG_VENDOR_PACKARDBELL is not set
 # CONFIG_VENDOR_PCENGINES is not set
+# CONFIG_VENDOR_PURISM is not set
 # CONFIG_VENDOR_RCA is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
@@ -134,7 +136,9 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS"
 # CONFIG_BOARD_ASUS_F2A85_M is not set
 # CONFIG_BOARD_ASUS_F2A85_M_LE is not set
 # CONFIG_BOARD_ASUS_K8V_X is not set
+# CONFIG_BOARD_ASUS_KCMA_D8 is not set
 # CONFIG_BOARD_ASUS_KFSN4_DRE is not set
+# CONFIG_BOARD_ASUS_KFSN4_DRE_K8 is not set
 CONFIG_BOARD_ASUS_KGPE_D16=y
 # CONFIG_BOARD_ASUS_M2N_E is not set
 # CONFIG_BOARD_ASUS_M2V_MX_SE is not set
@@ -151,27 +155,29 @@ CONFIG_BOARD_ASUS_KGPE_D16=y
 # CONFIG_BOARD_ASUS_P2B_LS is not set
 # CONFIG_BOARD_ASUS_P2B is not set
 # CONFIG_BOARD_ASUS_P3B_F is not set
+CONFIG_POST_IO=y
 CONFIG_AGP_APERTURE_SIZE=0x4000000
 CONFIG_BOOTBLOCK_MAINBOARD_INIT="mainboard/asus/kgpe-d16/bootblock.c"
-CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL=y
-# CONFIG_PCI_64BIT_PREF_MEM is not set
-CONFIG_SB_HT_CHAIN_ON_BUS0=1
 CONFIG_SOUTHBRIDGE_AMD_SB700_SATA_PORT_COUNT_BITFIELD=0x3f
+CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL=y
+CONFIG_MAX_REBOOT_CNT=10
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_RAMTOP=0x400000
+CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
+CONFIG_CBFS_SIZE=0x200000
+CONFIG_POST_DEVICE=y
 CONFIG_USBDEBUG_HCD_INDEX=0
 CONFIG_BOOT_MEDIA_SPI_BUS=0
 CONFIG_TTYS0_LCS=3
-CONFIG_CBFS_SIZE=0x200000
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_UDELAY_LAPIC_FIXED_FSB=200
-CONFIG_POST_DEVICE=y
 CONFIG_CPU_ADDR_BITS=48
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_USBDEBUG=y
 CONFIG_MAINBOARD_VERSION="1.0"
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
+CONFIG_DRIVERS_UART_8250IO=y
+# CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_2048=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
@@ -185,7 +191,9 @@ CONFIG_COREBOOT_ROMSIZE_KB_2048=y
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=2048
 CONFIG_ROM_SIZE=0x200000
+CONFIG_FMDFILE=""
 # CONFIG_SYSTEM_TYPE_LAPTOP is not set
+# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
 
 #
 # Chipset
@@ -195,12 +203,16 @@ CONFIG_ROM_SIZE=0x200000
 # SoC
 #
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
+CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/amd/amdfam10/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/amd/sb700/bootblock.c"
 CONFIG_TTYS0_BASE=0x3f8
 CONFIG_EHCI_BAR=0xfef00000
 CONFIG_HEAP_SIZE=0xc0000
+# 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
@@ -214,9 +226,8 @@ CONFIG_HEAP_SIZE=0xc0000
 # CPU
 #
 # CONFIG_CPU_ALLWINNER_A10 is not set
-CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
 CONFIG_DCACHE_BSP_STACK_SLUSH=0x4000
-CONFIG_DCACHE_AP_STACK_SIZE=0x400
+CONFIG_DCACHE_AP_STACK_SIZE=0x500
 CONFIG_CPU_SOCKET_TYPE=0x15
 # CONFIG_EXT_RT_TBL_SUPPORT is not set
 CONFIG_CBB=0x0
@@ -234,8 +245,10 @@ CONFIG_USE_LARGE_DCACHE=y
 CONFIG_NUM_IPI_STARTS=1
 CONFIG_SET_FIDVID_CORE_RANGE=0
 # CONFIG_CPU_AMD_AGESA is not set
+CONFIG_S3_DATA_POS=0x0
 CONFIG_S3_DATA_SIZE=32768
 # CONFIG_CPU_AMD_PI is not set
+CONFIG_EXT_CONF_SUPPORT=y
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
 CONFIG_SSE2=y
 # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
@@ -251,6 +264,8 @@ CONFIG_TSC_SYNC_LFENCE=y
 # CONFIG_TSC_SYNC_MFENCE is not set
 CONFIG_LOGICAL_CPUS=y
 # CONFIG_SMM_TSEG is not set
+# CONFIG_SMM_LAPIC_REMAP_MITIGATION is not set
+# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
 CONFIG_X86_AMD_FIXED_MTRRS=y
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_PARALLEL_MP is not set
@@ -261,8 +276,9 @@ CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 CONFIG_SSE=y
 CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
+# CONFIG_USES_MICROCODE_HEADER_FILES is not set
 # CONFIG_CPU_MICROCODE_CBFS_GENERATE is not set
-# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL is not set
+# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
 CONFIG_CPU_MICROCODE_CBFS_NONE=y
 
 #
@@ -293,6 +309,7 @@ CONFIG_VIDEO_MB=0
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
 CONFIG_RAMBASE=0x100000
 CONFIG_HPET_ADDRESS=0xfed00000
+CONFIG_HPET_MIN_TICKS=0x14
 CONFIG_MAX_PIRQ_LINKS=4
 
 #
@@ -308,12 +325,13 @@ CONFIG_SOUTHBRIDGE_AMD_SUBTYPE_SP5100=y
 CONFIG_SOUTHBRIDGE_AMD_SB700_DISABLE_ISA_DMA=y
 CONFIG_SOUTHBRIDGE_AMD_SR5650=y
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
 
 #
 # Super I/O
 #
-CONFIG_SUPERIO_NUVOTON_COMMON_ROMSTAGE=y
-CONFIG_SUPERIO_NUVOTON_NCT5572D=y
+CONFIG_SUPERIO_WINBOND_COMMON_ROMSTAGE=y
+CONFIG_SUPERIO_WINBOND_W83667HG_A=y
 
 #
 # Embedded Controllers
@@ -335,7 +353,6 @@ CONFIG_SUPERIO_NUVOTON_NCT5572D=y
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
 # CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
-# CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARM_LPAE is not set
 # CONFIG_ARCH_ARM64 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
@@ -346,19 +363,22 @@ CONFIG_SUPERIO_NUVOTON_NCT5572D=y
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
-# CONFIG_ARM64_BOOTBLOCK_CUSTOM is not set
 # CONFIG_ARM64_A53_ERRATUM_843419 is not set
 # CONFIG_ARCH_MIPS is not set
 # CONFIG_ARCH_BOOTBLOCK_MIPS is not set
 # CONFIG_ARCH_VERSTAGE_MIPS is not set
 # CONFIG_ARCH_ROMSTAGE_MIPS is not set
 # CONFIG_ARCH_RAMSTAGE_MIPS is not set
+# CONFIG_ARCH_POWER8 is not set
+# CONFIG_ARCH_BOOTBLOCK_POWER8 is not set
+# CONFIG_ARCH_VERSTAGE_POWER8 is not set
+# CONFIG_ARCH_ROMSTAGE_POWER8 is not set
+# CONFIG_ARCH_RAMSTAGE_POWER8 is not set
 # CONFIG_ARCH_RISCV is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
-# CONFIG_RISCV_BOOTBLOCK_CUSTOM is not set
 CONFIG_ARCH_X86=y
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -368,8 +388,10 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_ARCH_VERSTAGE_X86_64 is not set
 # CONFIG_ARCH_ROMSTAGE_X86_64 is not set
 # CONFIG_ARCH_RAMSTAGE_X86_64 is not set
+# CONFIG_USE_MARCH_586 is not set
 # CONFIG_AP_IN_SIPI_WAIT is not set
 # 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
@@ -378,6 +400,8 @@ 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
 
 #
 # Devices
@@ -386,7 +410,7 @@ CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 CONFIG_NATIVE_VGA_INIT_USE_EDID=y
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 # CONFIG_VGA_ROM_RUN is not set
-# CONFIG_ON_DEVICE_ROM_RUN is not set
+CONFIG_ON_DEVICE_ROM_LOAD=y
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 CONFIG_SMBUS_HAS_AUX_CHANNELS=y
 # CONFIG_SPD_CACHE is not set
@@ -396,11 +420,11 @@ CONFIG_PCIX_PLUGIN_SUPPORT=y
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_CLK_PM is not set
+CONFIG_PCIEXP_COMMON_CLOCK=y
+CONFIG_PCIEXP_ASPM=y
+CONFIG_PCIEXP_CLK_PM=y
 # CONFIG_EARLY_PCI_BRIDGE is not set
-# CONFIG_PCIEXP_L1_SUB_STATE is not set
+CONFIG_PCIEXP_L1_SUB_STATE=y
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_PXE_ROM is not set
@@ -452,7 +476,6 @@ CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
 CONFIG_DRIVERS_UART=y
-CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_DRIVERS_UART_8250MEM is not set
 # CONFIG_DRIVERS_UART_8250MEM_32 is not set
@@ -485,6 +508,13 @@ CONFIG_CONSOLE_SERIAL=y
 #
 # I/O mapped, 8250-compatible
 #
+
+#
+# Serial port base address = 0x3f8
+#
+# 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=y
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
@@ -505,15 +535,15 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_2 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
-# CONFIG_NO_POST is not set
 # CONFIG_CMOS_POST is not set
 # CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
-CONFIG_POST_IO=y
 CONFIG_POST_IO_PORT=0x80
+# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
 CONFIG_HAVE_ACPI_RESUME=y
+CONFIG_RESUME_PATH_SAME_AS_BOOT=y
 CONFIG_HAVE_HARD_RESET=y
 CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK=y
 CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK=y
@@ -533,6 +563,7 @@ CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
 CONFIG_HAVE_PIRQ_TABLE=y
 # CONFIG_COMMON_FADT is not set
+# CONFIG_ACPI_NHLT is not set
 
 #
 # System tables
@@ -550,10 +581,15 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
+# CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
+CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
+# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
+# CONFIG_COREINFO_SECONDARY_PAYLOAD is not set
+# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
 
 #
 # Debugging
@@ -575,10 +611,11 @@ CONFIG_HAVE_DEBUG_SMBUS=y
 # CONFIG_TRACE is not set
 CONFIG_ENABLE_APIC_EXT_ID=y
 CONFIG_WARNINGS_ARE_ERRORS=y
+CONFIG_IASL_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
 # CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
 # CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
 # CONFIG_REG_SCRIPT is not set
-CONFIG_MAX_REBOOT_CNT=3
+# CONFIG_DEBUG_BOOT_STATE is not set
diff --git a/resources/libreboot/config/grub/kgpe-d16/vbootrevision b/resources/libreboot/config/grub/kgpe-d16/vbootrevision
index 1e02412a..c18bc860 100644
--- a/resources/libreboot/config/grub/kgpe-d16/vbootrevision
+++ b/resources/libreboot/config/grub/kgpe-d16/vbootrevision
@@ -1 +1 @@
-fbf631c845c08299f0bcbae3f311c5807d34c0d6
+d187cd3fc792f8bcefbee4587c83eafbd08441fc