4 files changed, 91 insertions, 37 deletions
diff --git a/resources/libreboot/config/macbook21/config b/resources/libreboot/config/macbook21/config
index 2bb0cb7c..f443f49e 100644
--- a/resources/libreboot/config/macbook21/config
+++ b/resources/libreboot/config/macbook21/config
@@ -123,9 +123,6 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Apple Inc."
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
-# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
-# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
 CONFIG_STACK_SIZE=0x1000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
@@ -153,7 +150,8 @@ CONFIG_ROM_SIZE=0x200000
 CONFIG_MAINBOARD_SERIAL_NUMBER="W8724XXXXXX"
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="MacBook2,1"
 CONFIG_ARCH_X86=y
-# CONFIG_ARCH_ARMV7 is not set
+# CONFIG_ARCH_ARM is not set
+# CONFIG_ARCH_ARM64 is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
@@ -169,11 +167,24 @@ CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
 CONFIG_HPET_ADDRESS=0xfed00000
+# CONFIG_ARCH_BOOTBLOCK_ARM is not set
+# CONFIG_ARCH_ROMSTAGE_ARM is not set
+# CONFIG_ARCH_RAMSTAGE_ARM is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV4 is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV4 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
+# CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
 # CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
+# CONFIG_ARCH_ROMSTAGE_ARM64 is not set
+# CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_BOOTBLOCK_ARM_V8_64 is not set
+# CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set
+# CONFIG_ARCH_RAMSTAGE_ARM_V8_64 is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
@@ -189,8 +200,6 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 #
 # CONFIG_CPU_ALLWINNER_A10 is not set
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_SOCKET_SPECIFIC_OPTIONS=y
 CONFIG_XIP_ROM_SIZE=0x10000
@@ -267,6 +276,9 @@ CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
 # SoC
 #
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
+# CONFIG_SOC_QC_IPQ806X is not set
+# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
+# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
 
 #
 # Devices
@@ -276,8 +288,6 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 # CONFIG_VGA_ROM_RUN is not set
 # CONFIG_ON_DEVICE_ROM_RUN is not set
-# CONFIG_PCI_OPTION_ROM_RUN_REALMODE is not set
-# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
@@ -316,6 +326,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
+CONFIG_INTEL_INT15=y
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
@@ -360,7 +371,7 @@ CONFIG_TTYS0_LCS=3
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x10000
-CONFIG_CONSOLE_CAR_BUFFER_SIZE=0xc00
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -393,6 +404,7 @@ CONFIG_VGA=y
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
 CONFIG_HAVE_PIRQ_TABLE=y
+# CONFIG_PER_DEVICE_ACPI_TABLES is not set
 
 #
 # System tables
@@ -412,9 +424,8 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
+# CONFIG_SEABIOS_VGA_COREBOOT is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 
diff --git a/resources/libreboot/config/t60/config b/resources/libreboot/config/t60/config
index 395d555a..d2c1c680 100644
--- a/resources/libreboot/config/t60/config
+++ b/resources/libreboot/config/t60/config
@@ -121,9 +121,6 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
-# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
-# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
 CONFIG_STACK_SIZE=0x1000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
@@ -132,6 +129,7 @@ CONFIG_POST_DEVICE=y
 # CONFIG_BOARD_LENOVO_X60 is not set
 # CONFIG_BOARD_LENOVO_X200 is not set
 # CONFIG_BOARD_LENOVO_X201 is not set
+# CONFIG_BOARD_LENOVO_X220 is not set
 # CONFIG_BOARD_LENOVO_X230 is not set
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
@@ -158,7 +156,8 @@ CONFIG_ROM_SIZE=0x200000
 CONFIG_MAINBOARD_SERIAL_NUMBER="L3DKE06"
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="1951FEG"
 CONFIG_ARCH_X86=y
-# CONFIG_ARCH_ARMV7 is not set
+# CONFIG_ARCH_ARM is not set
+# CONFIG_ARCH_ARM64 is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
@@ -174,11 +173,24 @@ CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
 CONFIG_HPET_ADDRESS=0xfed00000
+# CONFIG_ARCH_BOOTBLOCK_ARM is not set
+# CONFIG_ARCH_ROMSTAGE_ARM is not set
+# CONFIG_ARCH_RAMSTAGE_ARM is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV4 is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV4 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
+# CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
 # CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
+# CONFIG_ARCH_ROMSTAGE_ARM64 is not set
+# CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_BOOTBLOCK_ARM_V8_64 is not set
+# CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set
+# CONFIG_ARCH_RAMSTAGE_ARM_V8_64 is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
@@ -194,8 +206,6 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 #
 # CONFIG_CPU_ALLWINNER_A10 is not set
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_SOCKET_SPECIFIC_OPTIONS=y
 CONFIG_XIP_ROM_SIZE=0x10000
@@ -279,6 +289,9 @@ CONFIG_EC_LENOVO_PMH7=y
 # SoC
 #
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
+# CONFIG_SOC_QC_IPQ806X is not set
+# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
+# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
 
 #
 # Devices
@@ -288,8 +301,6 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 # CONFIG_VGA_ROM_RUN is not set
 # CONFIG_ON_DEVICE_ROM_RUN is not set
-# CONFIG_PCI_OPTION_ROM_RUN_REALMODE is not set
-# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
@@ -329,6 +340,7 @@ CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
+CONFIG_INTEL_INT15=y
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
@@ -373,7 +385,7 @@ CONFIG_TTYS0_LCS=3
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x10000
-CONFIG_CONSOLE_CAR_BUFFER_SIZE=0xc00
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -406,6 +418,7 @@ CONFIG_VGA=y
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
 CONFIG_HAVE_PIRQ_TABLE=y
+# CONFIG_PER_DEVICE_ACPI_TABLES is not set
 
 #
 # System tables
@@ -425,9 +438,8 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
+# CONFIG_SEABIOS_VGA_COREBOOT is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 
diff --git a/resources/libreboot/config/x60/config b/resources/libreboot/config/x60/config
index 374a4c23..1757aeb2 100644
--- a/resources/libreboot/config/x60/config
+++ b/resources/libreboot/config/x60/config
@@ -121,9 +121,6 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
-# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
-# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
 CONFIG_STACK_SIZE=0x1000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
@@ -132,6 +129,7 @@ CONFIG_POST_DEVICE=y
 CONFIG_BOARD_LENOVO_X60=y
 # CONFIG_BOARD_LENOVO_X200 is not set
 # CONFIG_BOARD_LENOVO_X201 is not set
+# CONFIG_BOARD_LENOVO_X220 is not set
 # CONFIG_BOARD_LENOVO_X230 is not set
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
@@ -158,7 +156,8 @@ CONFIG_ROM_SIZE=0x200000
 CONFIG_MAINBOARD_SERIAL_NUMBER="L3BH242"
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="1702L8G"
 CONFIG_ARCH_X86=y
-# CONFIG_ARCH_ARMV7 is not set
+# CONFIG_ARCH_ARM is not set
+# CONFIG_ARCH_ARM64 is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
@@ -174,11 +173,24 @@ CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
 CONFIG_HPET_ADDRESS=0xfed00000
+# CONFIG_ARCH_BOOTBLOCK_ARM is not set
+# CONFIG_ARCH_ROMSTAGE_ARM is not set
+# CONFIG_ARCH_RAMSTAGE_ARM is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV4 is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV4 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
+# CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
 # CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
+# CONFIG_ARCH_ROMSTAGE_ARM64 is not set
+# CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_BOOTBLOCK_ARM_V8_64 is not set
+# CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set
+# CONFIG_ARCH_RAMSTAGE_ARM_V8_64 is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
@@ -194,8 +206,6 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 #
 # CONFIG_CPU_ALLWINNER_A10 is not set
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_SOCKET_SPECIFIC_OPTIONS=y
 CONFIG_XIP_ROM_SIZE=0x10000
@@ -279,6 +289,9 @@ CONFIG_EC_LENOVO_PMH7=y
 # SoC
 #
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
+# CONFIG_SOC_QC_IPQ806X is not set
+# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
+# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
 
 #
 # Devices
@@ -288,8 +301,6 @@ CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG=y
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 # CONFIG_VGA_ROM_RUN is not set
 # CONFIG_ON_DEVICE_ROM_RUN is not set
-# CONFIG_PCI_OPTION_ROM_RUN_REALMODE is not set
-# CONFIG_PCI_OPTION_ROM_RUN_YABEL is not set
 # CONFIG_MULTIPLE_VGA_ADAPTERS is not set
 # CONFIG_SPD_CACHE is not set
 CONFIG_PCI=y
@@ -329,6 +340,7 @@ CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
+CONFIG_INTEL_INT15=y
 # CONFIG_IPMI_KCS is not set
 CONFIG_DRIVERS_LENOVO_WACOM=y
 CONFIG_DIGITIZER_AUTODETECT=y
@@ -376,7 +388,7 @@ CONFIG_TTYS0_LCS=3
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x10000
-CONFIG_CONSOLE_CAR_BUFFER_SIZE=0xc00
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -409,6 +421,7 @@ CONFIG_VGA=y
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
 CONFIG_HAVE_PIRQ_TABLE=y
+# CONFIG_PER_DEVICE_ACPI_TABLES is not set
 
 #
 # System tables
@@ -428,9 +441,8 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
+# CONFIG_SEABIOS_VGA_COREBOOT is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 
diff --git a/resources/libreboot/config/x60t/config b/resources/libreboot/config/x60t/config
index 46213436..e5b6f196 100644
--- a/resources/libreboot/config/x60t/config
+++ b/resources/libreboot/config/x60t/config
@@ -129,6 +129,7 @@ CONFIG_POST_DEVICE=y
 CONFIG_BOARD_LENOVO_X60=y
 # CONFIG_BOARD_LENOVO_X200 is not set
 # CONFIG_BOARD_LENOVO_X201 is not set
+# CONFIG_BOARD_LENOVO_X220 is not set
 # CONFIG_BOARD_LENOVO_X230 is not set
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
@@ -155,7 +156,8 @@ CONFIG_ROM_SIZE=0x200000
 CONFIG_MAINBOARD_SERIAL_NUMBER="L3B8281"
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="6364WJ1"
 CONFIG_ARCH_X86=y
-# CONFIG_ARCH_ARMV7 is not set
+# CONFIG_ARCH_ARM is not set
+# CONFIG_ARCH_ARM64 is not set
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
@@ -171,11 +173,24 @@ CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801gx/bootblock.c"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
 CONFIG_HPET_ADDRESS=0xfed00000
+# CONFIG_ARCH_BOOTBLOCK_ARM is not set
+# CONFIG_ARCH_ROMSTAGE_ARM is not set
+# CONFIG_ARCH_RAMSTAGE_ARM is not set
+# CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set
+# CONFIG_ARCH_ROMSTAGE_ARMV4 is not set
+# CONFIG_ARCH_RAMSTAGE_ARMV4 is not set
 # CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
+# CONFIG_ARM_BOOTBLOCK_CUSTOM is not set
 # CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
+# CONFIG_ARCH_ROMSTAGE_ARM64 is not set
+# CONFIG_ARCH_RAMSTAGE_ARM64 is not set
+# CONFIG_ARCH_BOOTBLOCK_ARM_V8_64 is not set
+# CONFIG_ARCH_ROMSTAGE_ARM_V8_64 is not set
+# CONFIG_ARCH_RAMSTAGE_ARM_V8_64 is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
@@ -191,8 +206,6 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 #
 # CONFIG_CPU_ALLWINNER_A10 is not set
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
 # CONFIG_CPU_TI_AM335X is not set
 CONFIG_SOCKET_SPECIFIC_OPTIONS=y
 CONFIG_XIP_ROM_SIZE=0x10000
@@ -276,6 +289,9 @@ CONFIG_EC_LENOVO_PMH7=y
 # SoC
 #
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
+# CONFIG_SOC_QC_IPQ806X is not set
+# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
+# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
 
 #
 # Devices
@@ -324,6 +340,7 @@ CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
+CONFIG_INTEL_INT15=y
 # CONFIG_IPMI_KCS is not set
 CONFIG_DRIVERS_LENOVO_WACOM=y
 # CONFIG_DIGITIZER_AUTODETECT is not set
@@ -371,7 +388,7 @@ CONFIG_TTYS0_LCS=3
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x10000
-CONFIG_CONSOLE_CAR_BUFFER_SIZE=0xc00
+CONFIG_CONSOLE_PRERAM_BUFFER_SIZE=0xc00
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -404,6 +421,7 @@ CONFIG_VGA=y
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
 CONFIG_HAVE_PIRQ_TABLE=y
+# CONFIG_PER_DEVICE_ACPI_TABLES is not set
 
 #
 # System tables
@@ -424,6 +442,7 @@ CONFIG_PAYLOAD_ELF=y
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
+# CONFIG_SEABIOS_VGA_COREBOOT is not set
 CONFIG_PAYLOAD_FILE="grub.elf"
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y