Merge libreboot-6b6.

Conflicts:
	buildrom-withgrub

5 files changed, 143 insertions, 47 deletions

diff --git a/resources/libreboot/config/libpayload/config b/resources/libreboot/config/libpayload/config
new file mode 100644
index 0000000..28e1b8b
--- /dev/null
+++ b/resources/libreboot/config/libpayload/config
@@ -0,0 +1,71 @@
+#
+# Automatically generated make config: don't edit
+# libpayload version: 0.2.0
+# Sun Aug 24 05:04:19 2014
+#
+
+#
+# Generic Options
+#
+# CONFIG_LP_EXPERIMENTAL is not set
+# CONFIG_LP_OBSOLETE is not set
+# CONFIG_LP_DEVELOPER is not set
+# CONFIG_LP_CHROMEOS is not set
+
+#
+# Architecture Options
+#
+# CONFIG_LP_ARCH_ARMV7 is not set
+CONFIG_LP_ARCH_X86=y
+# CONFIG_LP_MEMMAP_RAM_ONLY is not set
+CONFIG_LP_MULTIBOOT=y
+
+#
+# Standard Libraries
+#
+CONFIG_LP_LIBC=y
+CONFIG_LP_CURSES=y
+CONFIG_LP_TINYCURSES=y
+# CONFIG_LP_PDCURSES is not set
+CONFIG_LP_CBFS=y
+CONFIG_LP_LZMA=y
+
+#
+# Console Options
+#
+# CONFIG_LP_SKIP_CONSOLE_INIT is not set
+CONFIG_LP_CBMEM_CONSOLE=y
+CONFIG_LP_SERIAL_CONSOLE=y
+CONFIG_LP_X86_SERIAL_CONSOLE=y
+CONFIG_LP_SERIAL_IOBASE=0x3f8
+# CONFIG_LP_SERIAL_SET_SPEED is not set
+# CONFIG_LP_SERIAL_ACS_FALLBACK is not set
+CONFIG_LP_VIDEO_CONSOLE=y
+CONFIG_LP_VGA_VIDEO_CONSOLE=y
+# CONFIG_LP_GEODELX_VIDEO_CONSOLE is not set
+# CONFIG_LP_COREBOOT_VIDEO_CONSOLE is not set
+CONFIG_LP_PC_KEYBOARD=y
+CONFIG_LP_PC_KEYBOARD_LAYOUT_US=y
+# CONFIG_LP_PC_KEYBOARD_LAYOUT_DE is not set
+
+#
+# Drivers
+#
+CONFIG_LP_PCI=y
+CONFIG_LP_NVRAM=y
+# CONFIG_LP_RTC_PORT_EXTENDED_VIA is not set
+CONFIG_LP_SPEAKER=y
+CONFIG_LP_STORAGE=y
+# CONFIG_LP_STORAGE_64BIT_LBA is not set
+CONFIG_LP_STORAGE_ATA=y
+CONFIG_LP_STORAGE_ATAPI=y
+CONFIG_LP_STORAGE_AHCI=y
+CONFIG_LP_STORAGE_AHCI_ONLY_TESTED=y
+# CONFIG_LP_USB is not set
+# CONFIG_LP_USB_GEN_HUB is not set
+CONFIG_LP_USB_PCI=y
+# CONFIG_LP_USB_MEMORY is not set
+# CONFIG_LP_BIG_ENDIAN is not set
+CONFIG_LP_LITTLE_ENDIAN=y
+CONFIG_LP_IO_ADDRESS_SPACE=y
+CONFIG_LP_ARCH_SPECIFIC_OPTIONS=y
diff --git a/resources/libreboot/config/macbook21/config b/resources/libreboot/config/macbook21/config
index 63af035..2bb0cb7 100644
--- a/resources/libreboot/config/macbook21/config
+++ b/resources/libreboot/config/macbook21/config
@@ -19,7 +19,7 @@ CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_BROKEN_CAR_MIGRATE is not set
-# CONFIG_DYNAMIC_CBMEM is not set
+CONFIG_DYNAMIC_CBMEM=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
@@ -111,14 +111,15 @@ CONFIG_VGA_BIOS_ID="8086,27a2"
 CONFIG_DRIVERS_PS2_KEYBOARD=y
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 # CONFIG_VGA_BIOS is not set
+# CONFIG_CONSOLE_POST is not set
 # CONFIG_UDELAY_IO is not set
 CONFIG_DCACHE_RAM_BASE=0xffdf8000
 CONFIG_DCACHE_RAM_SIZE=0x8000
 CONFIG_ACPI_SSDTX_NUM=0
+# CONFIG_BOARD_APPLE_MACBOOK11 is not set
 CONFIG_BOARD_APPLE_MACBOOK21=y
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Apple Inc."
-CONFIG_SEABIOS_PS2_TIMEOUT=3000
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
@@ -128,8 +129,11 @@ CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_STACK_SIZE=0x1000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
+CONFIG_POST_IO=y
+CONFIG_POST_DEVICE=y
+CONFIG_SEABIOS_PS2_TIMEOUT=0
 CONFIG_MAINBOARD_VERSION="1.0"
-CONFIG_CPU_ADDR_BITS=32
+CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
@@ -168,6 +172,8 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
@@ -189,7 +195,6 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 CONFIG_SOCKET_SPECIFIC_OPTIONS=y
 CONFIG_XIP_ROM_SIZE=0x10000
 # CONFIG_CPU_AMD_AGESA is not set
-CONFIG_HIGH_SCRATCH_MEMORY_SIZE=0x0
 CONFIG_CPU_INTEL_MODEL_6EX=y
 CONFIG_CPU_INTEL_MODEL_6FX=y
 CONFIG_SMM_TSEG_SIZE=0
@@ -261,18 +266,20 @@ CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
 #
 # SoC
 #
+# CONFIG_SOC_NVIDIA_TEGRA124 is not set
 
 #
 # Devices
 #
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG is not set
+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
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
@@ -292,6 +299,7 @@ CONFIG_PCI_BUS_SEGN_BITS=0
 #
 # Display
 #
+# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set
 
 #
 # PXE ROM
@@ -304,6 +312,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # Generic Drivers
 #
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
+# CONFIG_I2C_TPM is not set
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
 CONFIG_INTEL_EDID=y
@@ -311,7 +320,7 @@ CONFIG_INTEL_EDID=y
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_TPM is not set
+# CONFIG_LPC_TPM is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
@@ -325,6 +334,7 @@ CONFIG_DRIVERS_UART_8250IO=y
 CONFIG_HAVE_USBDEBUG=y
 # CONFIG_HAVE_USBDEBUG_OPTIONS is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
+# CONFIG_TPM is not set
 CONFIG_MMCONF_SUPPORT_DEFAULT=y
 CONFIG_MMCONF_SUPPORT=y
 # CONFIG_BOOTMODE_STRAPS is not set
@@ -362,11 +372,10 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_NO_POST is not set
 # CONFIG_CMOS_POST is not set
-# CONFIG_POST_IO is not set
-CONFIG_POST_DEVICE=y
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
+CONFIG_POST_IO_PORT=0x80
 CONFIG_HAVE_ACPI_RESUME=y
 # CONFIG_HAVE_ACPI_SLIC is not set
 CONFIG_HAVE_HARD_RESET=y
@@ -378,10 +387,9 @@ CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
 CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_VGA is not set
+CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 # CONFIG_RELOCATABLE_MODULES is not set
-# CONFIG_HAVE_REFCODE_BLOB is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
 CONFIG_HAVE_PIRQ_TABLE=y
diff --git a/resources/libreboot/config/t60/config b/resources/libreboot/config/t60/config
index d5754ff..395d555 100644
--- a/resources/libreboot/config/t60/config
+++ b/resources/libreboot/config/t60/config
@@ -19,7 +19,7 @@ CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_BROKEN_CAR_MIGRATE is not set
-# CONFIG_DYNAMIC_CBMEM is not set
+CONFIG_DYNAMIC_CBMEM=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
@@ -111,13 +111,13 @@ CONFIG_VGA_BIOS_ID="8086,27a2"
 CONFIG_DRIVERS_PS2_KEYBOARD=y
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 # CONFIG_VGA_BIOS is not set
+# CONFIG_CONSOLE_POST is not set
 # CONFIG_UDELAY_IO is not set
 CONFIG_DCACHE_RAM_BASE=0xffdf8000
 CONFIG_DCACHE_RAM_SIZE=0x8000
 CONFIG_ACPI_SSDTX_NUM=0
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
-CONFIG_SEABIOS_PS2_TIMEOUT=3000
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
@@ -127,14 +127,18 @@ CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_STACK_SIZE=0x1000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
+CONFIG_POST_IO=y
+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_X230 is not set
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 CONFIG_BOARD_LENOVO_T60=y
+CONFIG_SEABIOS_PS2_TIMEOUT=3000
 CONFIG_MAINBOARD_VERSION="ThinkPad T60"
-CONFIG_CPU_ADDR_BITS=32
+CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
@@ -173,6 +177,8 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
@@ -194,7 +200,6 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 CONFIG_SOCKET_SPECIFIC_OPTIONS=y
 CONFIG_XIP_ROM_SIZE=0x10000
 # CONFIG_CPU_AMD_AGESA is not set
-CONFIG_HIGH_SCRATCH_MEMORY_SIZE=0x0
 CONFIG_CPU_INTEL_MODEL_6EX=y
 CONFIG_CPU_INTEL_MODEL_6FX=y
 CONFIG_SMM_TSEG_SIZE=0
@@ -273,18 +278,20 @@ CONFIG_EC_LENOVO_PMH7=y
 #
 # SoC
 #
+# CONFIG_SOC_NVIDIA_TEGRA124 is not set
 
 #
 # Devices
 #
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG is not set
+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
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
@@ -304,6 +311,7 @@ CONFIG_PCI_BUS_SEGN_BITS=0
 #
 # Display
 #
+# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set
 
 #
 # PXE ROM
@@ -316,6 +324,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # Generic Drivers
 #
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
+# CONFIG_I2C_TPM is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
@@ -324,7 +333,7 @@ CONFIG_INTEL_EDID=y
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_TPM is not set
+# CONFIG_LPC_TPM is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
@@ -338,6 +347,7 @@ CONFIG_DRIVERS_UART_8250IO=y
 CONFIG_HAVE_USBDEBUG=y
 # CONFIG_HAVE_USBDEBUG_OPTIONS is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
+# CONFIG_TPM is not set
 CONFIG_MMCONF_SUPPORT_DEFAULT=y
 CONFIG_MMCONF_SUPPORT=y
 # CONFIG_BOOTMODE_STRAPS is not set
@@ -375,11 +385,10 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_NO_POST is not set
 # CONFIG_CMOS_POST is not set
-# CONFIG_POST_IO is not set
-CONFIG_POST_DEVICE=y
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
+CONFIG_POST_IO_PORT=0x80
 CONFIG_HAVE_ACPI_RESUME=y
 # CONFIG_HAVE_ACPI_SLIC is not set
 CONFIG_HAVE_HARD_RESET=y
@@ -391,10 +400,9 @@ CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
 CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_VGA is not set
+CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 # CONFIG_RELOCATABLE_MODULES is not set
-# CONFIG_HAVE_REFCODE_BLOB is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
 CONFIG_HAVE_PIRQ_TABLE=y
diff --git a/resources/libreboot/config/x60/config b/resources/libreboot/config/x60/config
index fe56ceb..374a4c2 100644
--- a/resources/libreboot/config/x60/config
+++ b/resources/libreboot/config/x60/config
@@ -19,7 +19,7 @@ CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_BROKEN_CAR_MIGRATE is not set
-# CONFIG_DYNAMIC_CBMEM is not set
+CONFIG_DYNAMIC_CBMEM=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
@@ -111,13 +111,13 @@ CONFIG_VGA_BIOS_ID="8086,27a2"
 CONFIG_DRIVERS_PS2_KEYBOARD=y
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 # CONFIG_VGA_BIOS is not set
+# CONFIG_CONSOLE_POST is not set
 # CONFIG_UDELAY_IO is not set
 CONFIG_DCACHE_RAM_BASE=0xffdf8000
 CONFIG_DCACHE_RAM_SIZE=0x8000
 CONFIG_ACPI_SSDTX_NUM=0
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
-CONFIG_SEABIOS_PS2_TIMEOUT=3000
 # CONFIG_PCI_64BIT_PREF_MEM is not set
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
@@ -127,14 +127,18 @@ CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_STACK_SIZE=0x1000
 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
 CONFIG_CBFS_SIZE=0x200000
+CONFIG_POST_IO=y
+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_X230 is not set
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
+CONFIG_SEABIOS_PS2_TIMEOUT=3000
 CONFIG_MAINBOARD_VERSION="ThinkPad X60s"
-CONFIG_CPU_ADDR_BITS=32
+CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
@@ -173,6 +177,8 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
@@ -194,7 +200,6 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 CONFIG_SOCKET_SPECIFIC_OPTIONS=y
 CONFIG_XIP_ROM_SIZE=0x10000
 # CONFIG_CPU_AMD_AGESA is not set
-CONFIG_HIGH_SCRATCH_MEMORY_SIZE=0x0
 CONFIG_CPU_INTEL_MODEL_6EX=y
 CONFIG_CPU_INTEL_MODEL_6FX=y
 CONFIG_SMM_TSEG_SIZE=0
@@ -273,18 +278,20 @@ CONFIG_EC_LENOVO_PMH7=y
 #
 # SoC
 #
+# CONFIG_SOC_NVIDIA_TEGRA124 is not set
 
 #
 # Devices
 #
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG is not set
+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
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
@@ -304,6 +311,7 @@ CONFIG_PCI_BUS_SEGN_BITS=0
 #
 # Display
 #
+# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set
 
 #
 # PXE ROM
@@ -316,6 +324,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # Generic Drivers
 #
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
+# CONFIG_I2C_TPM is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
@@ -327,7 +336,7 @@ CONFIG_DIGITIZER_AUTODETECT=y
 # CONFIG_DIGITIZER_ABSENT is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_TPM is not set
+# CONFIG_LPC_TPM is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
@@ -341,6 +350,7 @@ CONFIG_DRIVERS_UART_8250IO=y
 CONFIG_HAVE_USBDEBUG=y
 # CONFIG_HAVE_USBDEBUG_OPTIONS is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
+# CONFIG_TPM is not set
 CONFIG_MMCONF_SUPPORT_DEFAULT=y
 CONFIG_MMCONF_SUPPORT=y
 # CONFIG_BOOTMODE_STRAPS is not set
@@ -378,11 +388,10 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_NO_POST is not set
 # CONFIG_CMOS_POST is not set
-# CONFIG_POST_IO is not set
-CONFIG_POST_DEVICE=y
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
+CONFIG_POST_IO_PORT=0x80
 CONFIG_HAVE_ACPI_RESUME=y
 # CONFIG_HAVE_ACPI_SLIC is not set
 CONFIG_HAVE_HARD_RESET=y
@@ -394,10 +403,9 @@ CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
 CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_VGA is not set
+CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 # CONFIG_RELOCATABLE_MODULES is not set
-# CONFIG_HAVE_REFCODE_BLOB is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
 CONFIG_HAVE_PIRQ_TABLE=y
diff --git a/resources/libreboot/config/x60t/config b/resources/libreboot/config/x60t/config
index f698057..4621343 100644
--- a/resources/libreboot/config/x60t/config
+++ b/resources/libreboot/config/x60t/config
@@ -19,7 +19,7 @@ CONFIG_COMPRESS_RAMSTAGE=y
 CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_BROKEN_CAR_MIGRATE is not set
-# CONFIG_DYNAMIC_CBMEM is not set
+CONFIG_DYNAMIC_CBMEM=y
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
@@ -111,30 +111,31 @@ CONFIG_VGA_BIOS_ID="8086,27a2"
 CONFIG_DRIVERS_PS2_KEYBOARD=y
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 # CONFIG_VGA_BIOS is not set
+# CONFIG_CONSOLE_POST is not set
 # CONFIG_UDELAY_IO is not set
 CONFIG_DCACHE_RAM_BASE=0xffdf8000
 CONFIG_DCACHE_RAM_SIZE=0x8000
 CONFIG_ACPI_SSDTX_NUM=0
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
-CONFIG_SEABIOS_PS2_TIMEOUT=3000
 # 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
+CONFIG_POST_IO=y
+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_X230 is not set
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
+CONFIG_SEABIOS_PS2_TIMEOUT=3000
 CONFIG_MAINBOARD_VERSION="ThinkPad X60 Tablet"
-CONFIG_CPU_ADDR_BITS=32
+CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0
@@ -173,6 +174,8 @@ CONFIG_HPET_ADDRESS=0xfed00000
 # CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
+# CONFIG_CPU_HAS_BOOTBLOCK_INIT is not set
+# CONFIG_MAINBOARD_HAS_BOOTBLOCK_INIT is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
@@ -194,7 +197,6 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 CONFIG_SOCKET_SPECIFIC_OPTIONS=y
 CONFIG_XIP_ROM_SIZE=0x10000
 # CONFIG_CPU_AMD_AGESA is not set
-CONFIG_HIGH_SCRATCH_MEMORY_SIZE=0x0
 CONFIG_CPU_INTEL_MODEL_6EX=y
 CONFIG_CPU_INTEL_MODEL_6FX=y
 CONFIG_SMM_TSEG_SIZE=0
@@ -273,18 +275,18 @@ CONFIG_EC_LENOVO_PMH7=y
 #
 # SoC
 #
+# CONFIG_SOC_NVIDIA_TEGRA124 is not set
 
 #
 # Devices
 #
 CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG is not set
+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
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
@@ -304,6 +306,7 @@ CONFIG_PCI_BUS_SEGN_BITS=0
 #
 # Display
 #
+# CONFIG_FRAMEBUFFER_KEEP_VESA_MODE is not set
 
 #
 # PXE ROM
@@ -316,6 +319,7 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # Generic Drivers
 #
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
+# CONFIG_I2C_TPM is not set
 CONFIG_DRIVERS_ICS_954309=y
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
@@ -327,7 +331,7 @@ CONFIG_DIGITIZER_PRESENT=y
 # CONFIG_DIGITIZER_ABSENT is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_TPM is not set
+# CONFIG_LPC_TPM is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_DRIVER_TI_TPS65090 is not set
@@ -341,6 +345,7 @@ CONFIG_DRIVERS_UART_8250IO=y
 CONFIG_HAVE_USBDEBUG=y
 # CONFIG_HAVE_USBDEBUG_OPTIONS is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
+# CONFIG_TPM is not set
 CONFIG_MMCONF_SUPPORT_DEFAULT=y
 CONFIG_MMCONF_SUPPORT=y
 # CONFIG_BOOTMODE_STRAPS is not set
@@ -378,11 +383,10 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
 # CONFIG_NO_POST is not set
 # CONFIG_CMOS_POST is not set
-# CONFIG_POST_IO is not set
-CONFIG_POST_DEVICE=y
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
 # CONFIG_POST_DEVICE_PCI_PCIE is not set
+CONFIG_POST_IO_PORT=0x80
 CONFIG_HAVE_ACPI_RESUME=y
 # CONFIG_HAVE_ACPI_SLIC is not set
 CONFIG_HAVE_HARD_RESET=y
@@ -394,10 +398,9 @@ CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
 CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_VGA is not set
+CONFIG_VGA=y
 # CONFIG_GFXUMA is not set
 # CONFIG_RELOCATABLE_MODULES is not set
-# CONFIG_HAVE_REFCODE_BLOB is not set
 CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_HAVE_MP_TABLE=y
 CONFIG_HAVE_PIRQ_TABLE=y
@@ -420,8 +423,6 @@ 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_PAYLOAD_FILE="grub.elf"
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y