Merge libreboot-6b6.

Conflicts:
	buildrom-withgrub

13 files changed, 235 insertions, 617 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
diff --git a/resources/libreboot/patch/0000_t60_6723_and_6725_1_extension_textmode.git.diff b/resources/libreboot/patch/0000_t60_6723_and_6725_1_extension_textmode.git.diff
new file mode 100644
index 0000000..7f20c1f
--- /dev/null
+++ b/resources/libreboot/patch/0000_t60_6723_and_6725_1_extension_textmode.git.diff
@@ -0,0 +1,12 @@
+diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig
+index 5903c8b..e2638d8 100644
+--- a/src/mainboard/lenovo/t60/Kconfig
++++ b/src/mainboard/lenovo/t60/Kconfig
+@@ -20,6 +20,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
+ 	select HAVE_ACPI_TABLES
+ 	select HAVE_ACPI_RESUME
+ 	select MAINBOARD_HAS_NATIVE_VGA_INIT
++	select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
+ 	select H8_DOCK_EARLY_INIT
+ 	select HAVE_CMOS_DEFAULT
+ 	select INTEL_EDID
diff --git a/resources/libreboot/patch/0000_x60t_digitizer_irda.git.diff b/resources/libreboot/patch/0000_x60t_digitizer_irda.git.diff
deleted file mode 100644
index 11010d5..0000000
--- a/resources/libreboot/patch/0000_x60t_digitizer_irda.git.diff
+++ /dev/null
@@ -1,525 +0,0 @@
-diff --git a/src/drivers/Kconfig b/src/drivers/Kconfig
-index 874ec75..42d1583 100644
---- a/src/drivers/Kconfig
-+++ b/src/drivers/Kconfig
-@@ -26,6 +26,7 @@ source src/drivers/i2c/Kconfig
- source src/drivers/ics/Kconfig
- source src/drivers/intel/Kconfig
- source src/drivers/ipmi/Kconfig
-+source src/drivers/lenovo/Kconfig
- source src/drivers/maxim/Kconfig
- source src/drivers/parade/Kconfig
- if PC80_SYSTEM
-diff --git a/src/drivers/Makefile.inc b/src/drivers/Makefile.inc
-index 66fe7b8..cb26643 100644
---- a/src/drivers/Makefile.inc
-+++ b/src/drivers/Makefile.inc
-@@ -23,6 +23,7 @@ subdirs-y += emulation
- subdirs-y += generic
- subdirs-y += i2c
- subdirs-y += intel
-+subdirs-y += lenovo
- subdirs-y += maxim
- subdirs-y += net
- subdirs-y += parade
-diff --git a/src/drivers/lenovo/Kconfig b/src/drivers/lenovo/Kconfig
-index e69de29..30bacb9 100644
---- a/src/drivers/lenovo/Kconfig
-+++ b/src/drivers/lenovo/Kconfig
-@@ -0,0 +1,29 @@
-+config DRIVERS_LENOVO_WACOM
-+       bool
-+       default n
-+
-+if DRIVERS_LENOVO_WACOM
-+
-+choice
-+	prompt "Digitizer"
-+	default DIGITIZER_AUTODETECT
-+
-+config DIGITIZER_AUTODETECT
-+	bool "Autodetect"
-+	help
-+	  The presence of digitizer is inferred from model number stored in
-+	  AT24RF chip.
-+
-+config DIGITIZER_PRESENT
-+	bool "Present"
-+	help
-+	  The digitizer is assumed to be present.
-+
-+config DIGITIZER_ABSENT
-+	bool "Absent"
-+	help
-+	  The digitizer is assumed to be absent.
-+
-+endchoice
-+
-+endif
-diff --git a/src/drivers/lenovo/Makefile.inc b/src/drivers/lenovo/Makefile.inc
-index e69de29..c50db5b 100644
---- a/src/drivers/lenovo/Makefile.inc
-+++ b/src/drivers/lenovo/Makefile.inc
-@@ -0,0 +1 @@
-+ramstage-$(CONFIG_DRIVERS_LENOVO_WACOM) += wacom.c
-diff --git a/src/drivers/lenovo/lenovo.h b/src/drivers/lenovo/lenovo.h
-index e69de29..06b52e5 100644
---- a/src/drivers/lenovo/lenovo.h
-+++ b/src/drivers/lenovo/lenovo.h
-@@ -0,0 +1,4 @@
-+int drivers_lenovo_is_wacom_present(void);
-+void drivers_lenovo_serial_ports_ssdt_generate(const char *scope,
-+					       int have_dock_serial,
-+					       int have_infrared);
-diff --git a/src/drivers/lenovo/wacom.c b/src/drivers/lenovo/wacom.c
-index e69de29..ccccefd 100644
---- a/src/drivers/lenovo/wacom.c
-+++ b/src/drivers/lenovo/wacom.c
-@@ -0,0 +1,218 @@
-+/*
-+ * This file is part of the coreboot project.
-+ *
-+ * Copyright (C) 2014 Vladimir Serbinenko
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; version 2, or (at your
-+ * option) any later version, of the License.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-+ * MA 02110-1301 USA
-+ */
-+
-+#include <types.h>
-+#include <console/console.h>
-+#include <arch/acpi.h>
-+#include <arch/acpigen.h>
-+#include <device/device.h>
-+#include <device/pnp.h>
-+#include <string.h>
-+#include "lenovo.h"
-+#include "drivers/i2c/at24rf08c/lenovo.h"
-+
-+static const char tablet_numbers[][5] = {
-+	/* X60t. */
-+	"6363", "6364", "6365", "6366",
-+	"6367", "6368", "7762", "7763",
-+	"7764", "7767", "7768", "7769",
-+	/* X201t. */
-+	"0053", "0831", "2985", "3093",
-+	"3113", "3144", "3239", "4184",
-+	"7448", "7449", "7450", "7453",
-+	"2263", "2266",
-+};
-+
-+int
-+drivers_lenovo_is_wacom_present(void)
-+{
-+	const char *pn;
-+	int i;
-+	static int result = -1;
-+	device_t superio;
-+	u8 sioid;
-+
-+	if (result != -1)
-+		return result;
-+
-+	if (IS_ENABLED(CONFIG_DIGITIZER_PRESENT)) {
-+		printk (BIOS_INFO, "Digitizer state forced as present\n");
-+		return (result = 1);
-+	}
-+
-+	if (IS_ENABLED(CONFIG_DIGITIZER_ABSENT)) {
-+		printk (BIOS_INFO, "Digitizer state forced as absent\n");
-+		return (result = 0);
-+	}
-+
-+	superio = dev_find_slot_pnp (0x164e, 3);
-+	if (!superio) {
-+		printk (BIOS_INFO, "No Super I/O, skipping wacom\n");
-+		return (result = 0);
-+	}
-+
-+	/* Probe ID. */
-+	sioid = pnp_read_config(superio, 0x20);
-+	if (sioid == 0xff) {
-+		printk (BIOS_INFO, "Super I/O probe failed, skipping wacom\n");
-+		return (result = 0);
-+	}
-+
-+	pn = lenovo_mainboard_partnumber();
-+	if (!pn)
-+		return (result = 0);
-+	printk (BIOS_DEBUG, "Lenovo P/N is %s\n", pn);
-+	for (i = 0; i < ARRAY_SIZE (tablet_numbers); i++)
-+		if (memcmp (tablet_numbers[i], pn, 4) == 0) {
-+			printk (BIOS_DEBUG, "Lenovo P/N %s is a tablet\n", pn);
-+			return (result = 1);
-+		}
-+	printk (BIOS_DEBUG, "Lenovo P/N %s is not a tablet\n", pn);
-+	return (result = 0);
-+}
-+
-+void
-+drivers_lenovo_serial_ports_ssdt_generate(const char *scope,
-+					  int have_dock_serial,
-+					  int have_infrared)
-+{
-+	int scopelen, devicelen, reslen, methodlen;
-+
-+	scopelen = acpigen_write_scope(scope);
-+
-+	if (drivers_lenovo_is_wacom_present()) {
-+		/* Device op.  */
-+		scopelen += acpigen_emit_byte(0x5b);
-+		scopelen += acpigen_emit_byte(0x82);
-+		devicelen = acpigen_write_len_f();
-+		devicelen += acpigen_emit_namestring("DTR");
-+
-+		devicelen += acpigen_write_name("_HID");
-+		devicelen += acpigen_emit_eisaid("WACF004");
-+
-+		devicelen += acpigen_write_name("_CRS");
-+
-+		reslen = acpigen_write_resourcetemplate_header();
-+		reslen += acpigen_write_io16(0x200, 0x200, 1, 8, 1);
-+		reslen += acpigen_write_irq((1 << 5));
-+
-+		devicelen += reslen;
-+		devicelen += acpigen_write_resourcetemplate_footer(reslen);
-+
-+		/* method op */
-+		devicelen += acpigen_emit_byte(0x14);
-+		methodlen = acpigen_write_len_f();
-+		methodlen += acpigen_emit_namestring("_STA");
-+		/* no fnarg */
-+		methodlen += acpigen_emit_byte(0x00);
-+		/* return */
-+		methodlen += acpigen_emit_byte(0xa4);
-+		methodlen += acpigen_write_byte(0xf);
-+
-+		acpigen_patch_len(methodlen);
-+		devicelen += methodlen;
-+
-+		acpigen_patch_len(devicelen - 1);
-+		scopelen += devicelen;
-+	}
-+
-+	if (have_infrared) {
-+		/* Device op. */
-+		scopelen += acpigen_emit_byte(0x5b);
-+		scopelen += acpigen_emit_byte(0x82);
-+		devicelen = acpigen_write_len_f();
-+		devicelen += acpigen_emit_namestring("FIR");
-+
-+		devicelen += acpigen_write_name("_HID");
-+		devicelen += acpigen_emit_eisaid("IBM0071");
-+		devicelen += acpigen_write_name("_CID");
-+		devicelen += acpigen_emit_eisaid("PNP0511");
-+		devicelen += acpigen_write_name("_UID");
-+
-+		/* One */
-+		devicelen += acpigen_write_byte(0x1);
-+		devicelen += acpigen_write_name("_CRS");
-+
-+		reslen = acpigen_write_resourcetemplate_header();
-+		reslen += acpigen_write_io16(0x2f8, 0x2f8, 1, 8, 1);
-+		reslen += acpigen_write_irq(0x08);
-+
-+		devicelen += reslen;
-+		devicelen += acpigen_write_resourcetemplate_footer(reslen);
-+
-+		/* method op */
-+		devicelen += acpigen_emit_byte(0x14);
-+		methodlen = acpigen_write_len_f();
-+		methodlen += acpigen_emit_namestring("_STA");
-+		/* no fnarg */
-+		methodlen += acpigen_emit_byte(0x00);
-+		/* return */
-+		methodlen += acpigen_emit_byte(0xa4);
-+		methodlen += acpigen_write_byte(0xf);
-+		acpigen_patch_len(methodlen);
-+
-+		devicelen += methodlen;
-+
-+		acpigen_patch_len(devicelen - 1);
-+		scopelen += devicelen;
-+	}
-+
-+	if (have_dock_serial) {
-+		/* Device op.  */
-+		scopelen += acpigen_emit_byte(0x5b);
-+		scopelen += acpigen_emit_byte(0x82);
-+		devicelen = acpigen_write_len_f();
-+		devicelen += acpigen_emit_namestring("COMA");
-+
-+		devicelen += acpigen_write_name("_HID");
-+		devicelen += acpigen_emit_eisaid("PNP0501");
-+		devicelen += acpigen_write_name("_UID");
-+		/* Byte */
-+		devicelen += acpigen_write_byte(0x2);
-+
-+		devicelen += acpigen_write_name("_CRS");
-+
-+		reslen = acpigen_write_resourcetemplate_header();
-+		reslen += acpigen_write_io16(0x3f8, 0x3f8, 1, 8, 1);
-+		reslen += acpigen_write_irq(1 << 4);
-+
-+		devicelen += reslen;
-+		devicelen += acpigen_write_resourcetemplate_footer(reslen);
-+
-+		/* method op */
-+		devicelen += acpigen_emit_byte(0x14);
-+		methodlen = acpigen_write_len_f();
-+		methodlen += acpigen_emit_namestring("_STA");
-+		/* no fnarg */
-+		methodlen += acpigen_emit_byte(0x00);
-+		/* return */
-+		methodlen += acpigen_emit_byte(0xa4);
-+		methodlen += acpigen_write_byte(0xf);
-+		acpigen_patch_len(methodlen);
-+
-+		devicelen += methodlen;
-+
-+		acpigen_patch_len(devicelen - 1);
-+		scopelen += devicelen;
-+	}
-+
-+	acpigen_patch_len(scopelen - 1);
-+}
-diff --git a/src/mainboard/lenovo/Kconfig b/src/mainboard/lenovo/Kconfig
-index c1dec85..583efc8 100644
---- a/src/mainboard/lenovo/Kconfig
-+++ b/src/mainboard/lenovo/Kconfig
-@@ -4,7 +4,7 @@ choice
- 	prompt "Mainboard model"
- 
- config BOARD_LENOVO_X60
--	bool "ThinkPad X60 / X60s"
-+	bool "ThinkPad X60 / X60s / X60t"
- 	help
- 	  The following X60 series ThinkPad machines have been verified to
- 	  work correctly:
-@@ -13,7 +13,7 @@ config BOARD_LENOVO_X60
- 	    ThinkPad X60  (Model 1709)
- 
- config BOARD_LENOVO_X201
--	bool "ThinkPad X201"
-+	bool "ThinkPad X201 / X201s / X201t"
- 	help
- 	  Lenovo X201 laptop. Consult wiki for details.
- 
-diff --git a/src/mainboard/lenovo/t60/acpi/superio.asl b/src/mainboard/lenovo/t60/acpi/superio.asl
-index e69de29..41137ce 100644
---- a/src/mainboard/lenovo/t60/acpi/superio.asl
-+++ b/src/mainboard/lenovo/t60/acpi/superio.asl
-@@ -0,0 +1,16 @@
-+	Device (FIR)	// Infrared
-+	{
-+		Name(_HID, EISAID("IBM0071"))
-+		Name(_CID, EISAID("PNP0511"))
-+
-+		Name(_CRS, ResourceTemplate()
-+		{
-+			IO (Decode16, 0x2f8, 0x2f8, 0x01, 0x08)
-+			IRQNoFlags () {3}
-+		})
-+
-+		Method (_STA, 0)
-+		{
-+			Return (0xf)
-+		}
-+	}
-diff --git a/src/mainboard/lenovo/t60/devicetree.cb b/src/mainboard/lenovo/t60/devicetree.cb
-index 54b7da3..f13cb3a 100644
---- a/src/mainboard/lenovo/t60/devicetree.cb
-+++ b/src/mainboard/lenovo/t60/devicetree.cb
-@@ -153,6 +153,10 @@ chip northbridge/intel/i945
- 				chip superio/nsc/pc87382
- 					device pnp 164e.2 on # IR
- 						io 0x60 = 0x2f8
-+						irq 0x29 = 0xb0
-+						irq 0x70 = 0x3
-+						drq 0x74 = 0x1
-+						irq 0xf0 = 0x82
- 					end
- 
- 					device pnp 164e.3 off # Serial Port
-diff --git a/src/mainboard/lenovo/t60/romstage.c b/src/mainboard/lenovo/t60/romstage.c
-index dae917c..237e967 100644
---- a/src/mainboard/lenovo/t60/romstage.c
-+++ b/src/mainboard/lenovo/t60/romstage.c
-@@ -79,7 +79,7 @@ static void ich7_enable_lpc(void)
- 	// decode range
- 	pci_write_config16(PCI_DEV(0, 0x1f, 0), 0x80, 0x0210);
- 	// decode range
--	pci_write_config16(PCI_DEV(0, 0x1f, 0), 0x82, 0x1f0d);
-+	pci_write_config16(PCI_DEV(0, 0x1f, 0), 0x82, 0x1f0f);
- 
- 	/* range 0x1600 - 0x167f */
- 	pci_write_config16(PCI_DEV(0, 0x1f, 0), 0x84, 0x1601);
-diff --git a/src/mainboard/lenovo/x201/Kconfig b/src/mainboard/lenovo/x201/Kconfig
-index 50df47b..61038c4 100644
---- a/src/mainboard/lenovo/x201/Kconfig
-+++ b/src/mainboard/lenovo/x201/Kconfig
-@@ -17,6 +17,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
- 	select EARLY_CBMEM_INIT
- 	select MAINBOARD_HAS_NATIVE_VGA_INIT
- 	select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
-+	select SUPERIO_NSC_PC87382
-+	select DRIVERS_LENOVO_WACOM
- 
- config MAINBOARD_DIR
- 	string
-@@ -28,7 +30,7 @@ config MAINBOARD_PART_NUMBER
- 
- config MAINBOARD_VERSION
- 	string
--	default "ThinkPad X201"
-+	default "ThinkPad X201 / X201s / X201t"
- 
- config MAINBOARD_VENDOR
- 	string
-diff --git a/src/mainboard/lenovo/x201/acpi_tables.c b/src/mainboard/lenovo/x201/acpi_tables.c
-index 165de0d..710e369 100644
---- a/src/mainboard/lenovo/x201/acpi_tables.c
-+++ b/src/mainboard/lenovo/x201/acpi_tables.c
-@@ -31,6 +31,7 @@
- #include <device/pci.h>
- #include <device/pci_ids.h>
- #include "southbridge/intel/ibexpeak/nvs.h"
-+#include "drivers/lenovo/lenovo.h"
- 
- extern const unsigned char AmlCode[];
- #if CONFIG_HAVE_ACPI_SLIC
-@@ -93,6 +94,7 @@ unsigned long acpi_fill_ssdt_generator(unsigned long current,
- 				       const char *oem_table_id)
- {
- 	generate_cpu_entries();
-+	drivers_lenovo_serial_ports_ssdt_generate("\\_SB.PCI0.LPCB", 0, 0);
- 	return (unsigned long)(acpigen_get_current());
- }
- 
-diff --git a/src/mainboard/lenovo/x201/devicetree.cb b/src/mainboard/lenovo/x201/devicetree.cb
-index 9053f89..1db5bf0 100644
---- a/src/mainboard/lenovo/x201/devicetree.cb
-+++ b/src/mainboard/lenovo/x201/devicetree.cb
-@@ -143,6 +143,20 @@ chip northbridge/intel/nehalem
- 			end
- 			device pci 1f.0 on # PCI-LPC bridge
- 				subsystemid 0x17aa 0x2166
-+				chip superio/nsc/pc87382
-+					device pnp 164e.3 on # Digitizer
-+						io 0x60 = 0x200
-+						irq 0x29 = 0xb0
-+						irq 0x70 = 0x5
-+						irq 0xf0 = 0x82
-+					end
-+					# IR, not connected
-+					device pnp 164e.2 off end
-+					# GPIO, not connected
-+					device pnp 164e.7 off end
-+					# DLPC, not connected
-+					device pnp 164e.19 off end
-+				end
- 			end
- 			device pci 1f.2 on # IDE/SATA
- 				subsystemid 0x17aa 0x2168
-diff --git a/src/mainboard/lenovo/x201/romstage.c b/src/mainboard/lenovo/x201/romstage.c
-index 1237a5c..f74b441 100644
---- a/src/mainboard/lenovo/x201/romstage.c
-+++ b/src/mainboard/lenovo/x201/romstage.c
-@@ -53,7 +53,7 @@ static void pch_enable_lpc(void)
- 	/* Enable EC, PS/2 Keyboard/Mouse */
- 	pci_write_config16(PCH_LPC_DEV, LPC_EN,
- 			   CNF2_LPC_EN | CNF1_LPC_EN | MC_LPC_EN | KBC_LPC_EN |
--			   COMA_LPC_EN);
-+			   COMA_LPC_EN | GAMEL_LPC_EN);
- 
- 	pci_write_config32(PCH_LPC_DEV, LPC_GEN1_DEC, 0x7c1601);
- 	pci_write_config32(PCH_LPC_DEV, LPC_GEN2_DEC, 0xc15e1);
-diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig
-index b0d7a06..3c708cd 100644
---- a/src/mainboard/lenovo/x60/Kconfig
-+++ b/src/mainboard/lenovo/x60/Kconfig
-@@ -24,6 +24,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
- 	select MAINBOARD_HAS_NATIVE_VGA_INIT
- 	select EARLY_CBMEM_INIT
- 	select H8_DOCK_EARLY_INIT
-+	select DRIVERS_LENOVO_WACOM
- 	select INTEL_EDID
- 
- config MAINBOARD_DIR
-@@ -40,7 +41,7 @@ config DCACHE_RAM_SIZE
- 
- config MAINBOARD_PART_NUMBER
- 	string
--	default "ThinkPad X60 / X60s"
-+	default "ThinkPad X60 / X60s / X60t"
- 
- config MMCONF_BASE_ADDRESS
- 	hex
-diff --git a/src/mainboard/lenovo/x60/acpi_tables.c b/src/mainboard/lenovo/x60/acpi_tables.c
-index f6ed4ae..c8fce7f 100644
---- a/src/mainboard/lenovo/x60/acpi_tables.c
-+++ b/src/mainboard/lenovo/x60/acpi_tables.c
-@@ -29,6 +29,7 @@
- #include <device/device.h>
- #include <device/pci.h>
- #include <device/pci_ids.h>
-+#include "drivers/lenovo/lenovo.h"
- 
- extern const unsigned char AmlCode[];
- #if CONFIG_HAVE_ACPI_SLIC
-@@ -86,6 +87,7 @@ unsigned long acpi_fill_madt(unsigned long current)
- unsigned long acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id)
- {
- 	generate_cpu_entries();
-+	drivers_lenovo_serial_ports_ssdt_generate("\\_SB.PCI0.LPCB", 1, 1);
- 	return (unsigned long) (acpigen_get_current());
- }
- 
-diff --git a/src/mainboard/lenovo/x60/devicetree.cb b/src/mainboard/lenovo/x60/devicetree.cb
-index dc1c5da..6f9d5d9 100644
---- a/src/mainboard/lenovo/x60/devicetree.cb
-+++ b/src/mainboard/lenovo/x60/devicetree.cb
-@@ -130,10 +130,17 @@ chip northbridge/intel/i945
- 				chip superio/nsc/pc87382
- 					device pnp 164e.2 on # IR
- 						io 0x60 = 0x2f8
-+						irq 0x29 = 0xb0
-+						irq 0x70 = 0x3
-+						drq 0x74 = 0x1
-+						irq 0xf0 = 0x82
- 					end
- 
--					device pnp 164e.3 off # Serial Port
--						io 0x60 = 0x3f8
-+					device pnp 164e.3 on # Digitizer
-+						io 0x60 = 0x200
-+						irq 0x29 = 0xb0
-+						irq 0x70 = 0x5
-+						irq 0xf0 = 0x82
- 					end
- 
- 					device pnp 164e.7 on # GPIO
-diff --git a/src/mainboard/lenovo/x60/romstage.c b/src/mainboard/lenovo/x60/romstage.c
-index 1198fb2..8eca464 100644
---- a/src/mainboard/lenovo/x60/romstage.c
-+++ b/src/mainboard/lenovo/x60/romstage.c
-@@ -86,7 +86,7 @@ static void ich7_enable_lpc(void)
- 	// decode range
- 	pci_write_config16(PCI_DEV(0, 0x1f, 0), 0x80, 0x0210);
- 	// decode range
--	pci_write_config16(PCI_DEV(0, 0x1f, 0), 0x82, 0x1f0d);
-+	pci_write_config16(PCI_DEV(0, 0x1f, 0), 0x82, 0x1f0f);
- 
- 	/* range 0x1600 - 0x167f */
- 	pci_write_config16(PCI_DEV(0, 0x1f, 0), 0x84, 0x1601);
diff --git a/resources/libreboot/patch/0001_i945_3dfix.git.diff b/resources/libreboot/patch/0001_i945_3dfix.git.diff
deleted file mode 100644
index f417339..0000000
--- a/resources/libreboot/patch/0001_i945_3dfix.git.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c
-index 4dd2ccf..5dbaff3 100644
---- a/src/northbridge/intel/i945/gma.c
-+++ b/src/northbridge/intel/i945/gma.c
-@@ -33,6 +33,8 @@
- 
- #define GDRST 0xc0
- 
-+#define BSM 0x5c
-+
- #define  LVDS_CLOCK_A_POWERUP_ALL	(3 << 8)
- #define  LVDS_CLOCK_B_POWERUP_ALL	(3 << 4)
- #define  LVDS_CLOCK_BOTH_POWERUP_ALL	(3 << 2)
-@@ -51,11 +53,19 @@
- static int gtt_setup(unsigned int mmiobase)
- {
- 	unsigned long PGETBL_save;
--
--	PGETBL_save = read32(mmiobase + PGETBL_CTL) & ~PGETBL_ENABLED;
-+	unsigned long tom; // top of memory
-+
-+	/*
-+	 * The Video BIOS places the GTT right below top of memory.
-+	 * It is not documented in the Intel 945 datasheet, but the Intel
-+	 * developers said that it is normally placed there.
-+	 *
-+	 * TODO: Add option to make the GTT size runtime 
-+	 * configurable
-+	*/
-+	tom = pci_read_config8(dev_find_slot(0, PCI_DEVFN(0, 0)), TOLUD) << 24;
-+	PGETBL_save = tom - 256 * KiB;
- 	PGETBL_save |= PGETBL_ENABLED;
--
--	PGETBL_save |= pci_read_config32(dev_find_slot(0, PCI_DEVFN(2,0)), 0x5c) & 0xfffff000;
- 	PGETBL_save |= 2; /* set GTT to 256kb */
- 
- 	write32(mmiobase + GFX_FLSH_CNTL, 0);
diff --git a/resources/libreboot/patch/0001_t60_6731_6_extension_acpi_brightness.git.diff b/resources/libreboot/patch/0001_t60_6731_6_extension_acpi_brightness.git.diff
new file mode 100644
index 0000000..4e36a6c
--- /dev/null
+++ b/resources/libreboot/patch/0001_t60_6731_6_extension_acpi_brightness.git.diff
@@ -0,0 +1,12 @@
+diff --git a/src/mainboard/lenovo/t60/devicetree.cb b/src/mainboard/lenovo/t60/devicetree.cb
+index 54b7da3..f187bfb 100644
+--- a/src/mainboard/lenovo/t60/devicetree.cb
++++ b/src/mainboard/lenovo/t60/devicetree.cb
+@@ -25,7 +25,6 @@ chip northbridge/intel/i945
+ 	register "gpu_hotplug" = "0x00000220"
+ 	register "gpu_lvds_use_spread_spectrum_clock" = "1"
+ 	register "gpu_lvds_is_dual_channel" = "1"
+-	register "gpu_backlight" = "0x1280128"
+ 
+ 	device cpu_cluster 0 on
+ 		chip cpu/intel/socket_mFCPGA478
diff --git a/resources/libreboot/patch/0002_i945_6731_6_extension_fix_uneven_backlight.git.diff b/resources/libreboot/patch/0002_i945_6731_6_extension_fix_uneven_backlight.git.diff
new file mode 100644
index 0000000..eb8936e
--- /dev/null
+++ b/resources/libreboot/patch/0002_i945_6731_6_extension_fix_uneven_backlight.git.diff
@@ -0,0 +1,22 @@
+diff --git a/src/northbridge/intel/i945/acpi/igd.asl b/src/northbridge/intel/i945/acpi/igd.asl
+index 47b66a7..f9c8ef4 100644
+--- a/src/northbridge/intel/i945/acpi/igd.asl
++++ b/src/northbridge/intel/i945/acpi/igd.asl
+@@ -216,14 +216,14 @@ Device (GFX0)
+ 
+ 		Method (_BCM, 1, NotSerialized)
+ 		{
+-			Store (ShiftLeft (Arg0, 4), ^^BCLV)
++			Store (ShiftLeft (Arg0, 9), ^^BCLV)
+ 			Store (0x80000000, ^^CR1)
+-			Store (ShiftLeft (0x61, 4), ^^BCLM)
++			Store (ShiftLeft (0x61, 9), ^^BCLM)
+ 		}
+ 		Method (_BQC, 0, NotSerialized)
+ 		{
+ 			Store (^^BCLV, Local0)
+-			ShiftRight (Local0, 4, Local0)
++			ShiftRight (Local0, 9, Local0)
+ 			Return (Local0)
+ 		}
+ 
diff --git a/resources/libreboot/patch/0002_x60_backlight.diff b/resources/libreboot/patch/0002_x60_backlight.diff
deleted file mode 100644
index d787db5..0000000
--- a/resources/libreboot/patch/0002_x60_backlight.diff
+++ /dev/null
@@ -1,4 +0,0 @@
-28c28
-< 	register "gpu_backlight" = "0x1280128"
----
-> 	register "gpu_backlight" = "0x879F879E"
diff --git a/resources/libreboot/patch/0003_t60_backlight.diff b/resources/libreboot/patch/0003_t60_backlight.diff
deleted file mode 100644
index 2d1a396..0000000
--- a/resources/libreboot/patch/0003_t60_backlight.diff
+++ /dev/null
@@ -1,4 +0,0 @@
-28c28
-< 	register "gpu_backlight" = "0x1280128"
----
-> 	register "gpu_backlight" = "0x58BF58BE"
diff --git a/resources/libreboot/patch/gitdiff b/resources/libreboot/patch/gitdiff
new file mode 100644
index 0000000..db3218d
--- /dev/null
+++ b/resources/libreboot/patch/gitdiff
@@ -0,0 +1,46 @@
+diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig
+index 5903c8b..e2638d8 100644
+--- a/src/mainboard/lenovo/t60/Kconfig
++++ b/src/mainboard/lenovo/t60/Kconfig
+@@ -20,6 +20,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
+ 	select HAVE_ACPI_TABLES
+ 	select HAVE_ACPI_RESUME
+ 	select MAINBOARD_HAS_NATIVE_VGA_INIT
++	select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
+ 	select H8_DOCK_EARLY_INIT
+ 	select HAVE_CMOS_DEFAULT
+ 	select INTEL_EDID
+diff --git a/src/mainboard/lenovo/t60/devicetree.cb b/src/mainboard/lenovo/t60/devicetree.cb
+index 54b7da3..f187bfb 100644
+--- a/src/mainboard/lenovo/t60/devicetree.cb
++++ b/src/mainboard/lenovo/t60/devicetree.cb
+@@ -25,7 +25,6 @@ chip northbridge/intel/i945
+ 	register "gpu_hotplug" = "0x00000220"
+ 	register "gpu_lvds_use_spread_spectrum_clock" = "1"
+ 	register "gpu_lvds_is_dual_channel" = "1"
+-	register "gpu_backlight" = "0x1280128"
+ 
+ 	device cpu_cluster 0 on
+ 		chip cpu/intel/socket_mFCPGA478
+diff --git a/src/northbridge/intel/i945/acpi/igd.asl b/src/northbridge/intel/i945/acpi/igd.asl
+index 47b66a7..f9c8ef4 100644
+--- a/src/northbridge/intel/i945/acpi/igd.asl
++++ b/src/northbridge/intel/i945/acpi/igd.asl
+@@ -216,14 +216,14 @@ Device (GFX0)
+ 
+ 		Method (_BCM, 1, NotSerialized)
+ 		{
+-			Store (ShiftLeft (Arg0, 4), ^^BCLV)
++			Store (ShiftLeft (Arg0, 9), ^^BCLV)
+ 			Store (0x80000000, ^^CR1)
+-			Store (ShiftLeft (0x61, 4), ^^BCLM)
++			Store (ShiftLeft (0x61, 9), ^^BCLM)
+ 		}
+ 		Method (_BQC, 0, NotSerialized)
+ 		{
+ 			Store (^^BCLV, Local0)
+-			ShiftRight (Local0, 4, Local0)
++			ShiftRight (Local0, 9, Local0)
+ 			Return (Local0)
+ 		}
+