diff --git a/x230/config-d8ec973fd2 b/x230/config-a7835c462e
similarity index 95%
rename from x230/config-d8ec973fd2
rename to x230/config-a7835c462e
index 886e11b..7466e80 100644
--- a/x230/config-d8ec973fd2
+++ b/x230/config-a7835c462e
@@ -24,6 +24,7 @@ CONFIG_COLLECT_TIMESTAMPS=y
 CONFIG_USE_BLOBS=y
 # CONFIG_COVERAGE is not set
 # CONFIG_UBSAN is not set
+# CONFIG_NO_RELOCATABLE_RAMSTAGE is not set
 CONFIG_RELOCATABLE_RAMSTAGE=y
 CONFIG_CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM=y
 # CONFIG_UPDATE_IMAGE is not set
@@ -36,25 +37,19 @@ CONFIG_CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM=y
 #
 # Important: Run 'make distclean' before switching boards
 #
-# CONFIG_VENDOR_AAEON is not set
 # CONFIG_VENDOR_ADI is not set
 # CONFIG_VENDOR_ADLINK is not set
 # CONFIG_VENDOR_ADVANSUS is not set
 # CONFIG_VENDOR_AMD is not set
 # CONFIG_VENDOR_AOPEN is not set
 # CONFIG_VENDOR_APPLE is not set
-# CONFIG_VENDOR_ARTECGROUP is not set
 # CONFIG_VENDOR_ASROCK is not set
 # CONFIG_VENDOR_ASUS is not set
 # CONFIG_VENDOR_AVALUE is not set
-# CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
-# CONFIG_VENDOR_BCOM is not set
 # CONFIG_VENDOR_BIOSTAR is not set
-# CONFIG_VENDOR_BROADCOM is not set
 # CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
-# CONFIG_VENDOR_DIGITALLOGIC is not set
 # CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_ESD is not set
@@ -67,15 +62,12 @@ CONFIG_CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM=y
 # CONFIG_VENDOR_IBASE is not set
 # CONFIG_VENDOR_IEI is not set
 # CONFIG_VENDOR_INTEL is not set
-# CONFIG_VENDOR_IWILL is not set
 # CONFIG_VENDOR_JETWAY is not set
 # CONFIG_VENDOR_KONTRON is not set
 CONFIG_VENDOR_LENOVO=y
-# CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
 # CONFIG_VENDOR_LOWRISC is not set
 # CONFIG_VENDOR_MSI is not set
-# CONFIG_VENDOR_NVIDIA is not set
 # CONFIG_VENDOR_OCP is not set
 # CONFIG_VENDOR_PACKARDBELL is not set
 # CONFIG_VENDOR_PCENGINES is not set
@@ -86,29 +78,21 @@ CONFIG_VENDOR_LENOVO=y
 # CONFIG_VENDOR_SCALEWAY is not set
 # CONFIG_VENDOR_SIEMENS is not set
 # CONFIG_VENDOR_SIFIVE is not set
-# CONFIG_VENDOR_SUNW is not set
 # CONFIG_VENDOR_SUPERMICRO is not set
-# CONFIG_VENDOR_TECHNEXION is not set
 # CONFIG_VENDOR_TI is not set
-# CONFIG_VENDOR_TRAVERSE is not set
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
-# CONFIG_VENDOR_WINENT is not set
-# CONFIG_VENDOR_WINNET is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="lenovo/x230"
 CONFIG_MAINBOARD_PART_NUMBER="ThinkPad X230"
-CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_MAX_CPUS=8
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
 CONFIG_CBFS_SIZE=0x400000
 CONFIG_PAYLOAD_CONFIGFILE=""
+CONFIG_MAINBOARD_VENDOR="LENOVO"
 CONFIG_VGA_BIOS_ID="8086,0166"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 CONFIG_DIMM_SPD_SIZE=256
 CONFIG_VGA_BIOS=y
-CONFIG_DCACHE_RAM_BASE=0xfefe0000
-CONFIG_DCACHE_RAM_SIZE=0x20000
 CONFIG_VGA_BIOS_FILE="pci8086,0166.rom"
 CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID=0x17aa
 CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x21fa
@@ -116,12 +100,16 @@ CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x21fa
 # CONFIG_HAVE_ME_BIN is not set
 CONFIG_DRAM_RESET_GATE_GPIO=10
 CONFIG_DEVICETREE="devicetree.cb"
+CONFIG_DCACHE_RAM_BASE=0xfefe0000
+CONFIG_DCACHE_RAM_SIZE=0x20000
 CONFIG_MAX_REBOOT_CNT=3
 CONFIG_USBDEBUG_HCD_INDEX=2
 CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
 CONFIG_IFD_BIOS_SECTION=""
 CONFIG_IFD_ME_SECTION=""
 # CONFIG_VBOOT is not set
+CONFIG_TPM_PIRQ=0x0
 CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
 CONFIG_FMDFILE=""
 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
@@ -140,6 +128,7 @@ CONFIG_IFD_GBE_SECTION=""
 # CONFIG_BOARD_LENOVO_T520 is not set
 # CONFIG_BOARD_LENOVO_W520 is not set
 # CONFIG_BOARD_LENOVO_T530 is not set
+# CONFIG_BOARD_LENOVO_W530 is not set
 # CONFIG_BOARD_LENOVO_T60 is not set
 # CONFIG_BOARD_LENOVO_X131E is not set
 # CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
@@ -151,6 +140,7 @@ CONFIG_BOARD_LENOVO_X230=y
 # CONFIG_BOARD_LENOVO_X60 is not set
 # CONFIG_BOARD_LENOVO_Z61T is not set
 # CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
+# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
@@ -186,13 +176,12 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 #
 CONFIG_CPU_SPECIFIC_OPTIONS=y
 # CONFIG_S3_VGA_ROM_RUN is not set
-CONFIG_RAMTOP=0x200000
 CONFIG_HEAP_SIZE=0x4000
-CONFIG_RAMBASE=0x100000
 CONFIG_EHCI_BAR=0xfef00000
 CONFIG_SERIRQ_CONTINUOUS_MODE=y
 CONFIG_SMM_TSEG_SIZE=0x800000
 CONFIG_SMM_RESERVED_SIZE=0x100000
+CONFIG_SMM_MODULE_STACK_SIZE=0x400
 CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
 CONFIG_BOOTBLOCK_CPU_INIT="cpu/intel/model_206ax/bootblock.c"
@@ -211,13 +200,14 @@ CONFIG_PCIEXP_COMMON_CLOCK=y
 CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/sandybridge/bootblock.c"
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/bd82x6x/bootblock.c"
 CONFIG_CACHE_MRC_SIZE_KB=512
-CONFIG_STACK_SIZE=0x1000
+CONFIG_RAMTOP=0x200000
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_UART_PCI_ADDR=0x0
 # CONFIG_SOC_INTEL_KABYLAKE is not set
 # CONFIG_SOC_LOWRISC_LOWRISC is not set
 # CONFIG_SOC_MARVELL_MVMAP2315 is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
+# CONFIG_SOC_MEDIATEK_MT8183 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
@@ -233,13 +223,13 @@ CONFIG_UART_PCI_ADDR=0x0
 # CPU
 #
 # CONFIG_CPU_ALLWINNER_A10 is not set
-CONFIG_SOCKET_SPECIFIC_OPTIONS=y
 CONFIG_XIP_ROM_SIZE=0x20000
 CONFIG_NUM_IPI_STARTS=2
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
 CONFIG_CPU_INTEL_MODEL_306AX=y
+CONFIG_SOCKET_SPECIFIC_OPTIONS=y
 CONFIG_SSE2=y
 CONFIG_CPU_INTEL_SOCKET_RPGA989=y
 # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
@@ -269,7 +259,7 @@ CONFIG_SMM_MODULE_HEAP_SIZE=0x4000
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
 # CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
-# CONFIG_NO_CAR_GLOBAL_MIGRATION is not set
+CONFIG_NO_CAR_GLOBAL_MIGRATION=y
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
 CONFIG_MMX=y
@@ -286,18 +276,12 @@ CONFIG_CPU_UCODE_BINARIES=""
 # Northbridge
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NO_MMCONF_SUPPORT is not set
-# CONFIG_AMD_NB_CIMX is not set
-# CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-# CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE=y
 CONFIG_USE_NATIVE_RAMINIT=y
 # CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
 # CONFIG_NATIVE_RAMINIT_IGNORE_XMP_MAX_DIMMS is not set
 CONFIG_SANDYBRIDGE_IVYBRIDGE_LVDS=y
-CONFIG_HPET_ADDRESS=0xfed00000
-CONFIG_HPET_MIN_TICKS=0x80
 CONFIG_MAX_PIRQ_LINKS=4
 
 #
@@ -306,6 +290,7 @@ CONFIG_MAX_PIRQ_LINKS=4
 # CONFIG_AMD_SB_CIMX is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
+CONFIG_HPET_MIN_TICKS=0x80
 CONFIG_SOUTHBRIDGE_INTEL_C216=y
 CONFIG_SOUTH_BRIDGE_OPTIONS=y
 CONFIG_LOCK_SPI_FLASH_NONE=y
@@ -413,7 +398,7 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_USE_MARCH_586 is not set
 # CONFIG_AP_IN_SIPI_WAIT is not set
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
-# CONFIG_ROMCC is not set
+CONFIG_RAMBASE=0x100000
 # CONFIG_CBMEM_TOP_BACKUP is not set
 # CONFIG_LATE_CBMEM_INIT is not set
 # CONFIG_EARLY_EBDA_INIT is not set
@@ -424,8 +409,10 @@ CONFIG_HAVE_CMOS_DEFAULT=y
 CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
 # CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
+# CONFIG_HPET_ADDRESS_OVERRIDE is not set
+CONFIG_HPET_ADDRESS=0xfed00000
 CONFIG_ID_SECTION_OFFSET=0x80
-# CONFIG_POSTCAR_STAGE is not set
+CONFIG_POSTCAR_STAGE=y
 # CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
 # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
 CONFIG_BOOTBLOCK_SIMPLE=y
@@ -463,6 +450,7 @@ CONFIG_YABEL_VIRTMEM_LOCATION=0x1000000
 CONFIG_VGA_TEXT_FRAMEBUFFER=y
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
 CONFIG_PCI=y
+# CONFIG_NO_MMCONF_SUPPORT is not set
 CONFIG_MMCONF_SUPPORT=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
@@ -472,7 +460,8 @@ CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # CONFIG_EARLY_PCI_BRIDGE is not set
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
-# CONFIG_INTEL_GMA_ADD_VBT_DATA_FILE is not set
+CONFIG_INTEL_GMA_HAVE_VBT=y
+CONFIG_INTEL_GMA_ADD_VBT=y
 # CONFIG_SOFTWARE_I2C is not set
 
 #
@@ -494,7 +483,6 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH=y
 CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
 # CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY is not set
-# CONFIG_SPI_FLASH_SMM is not set
 # CONFIG_SPI_FLASH_NO_FAST_READ is not set
 CONFIG_SPI_FLASH_ADESTO=y
 CONFIG_SPI_FLASH_AMIC=y
@@ -532,6 +520,7 @@ CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_RX6110SA is not set
 # CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
 # CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
+# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
 # CONFIG_PLATFORM_USES_FSP2_0 is not set
 # CONFIG_INTEL_DDI is not set
 # CONFIG_INTEL_EDID is not set
@@ -555,7 +544,9 @@ CONFIG_DRIVERS_INTEL_WIFI=y
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
-# CONFIG_LPC_TPM is not set
+CONFIG_LPC_TPM=y
+CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
+CONFIG_MAINBOARD_HAS_LPC_TPM=y
 CONFIG_VGA=y
 CONFIG_DRIVERS_RICOH_RCE822=y
 # CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
@@ -565,6 +556,7 @@ CONFIG_DRIVERS_RICOH_RCE822=y
 # CONFIG_DRIVER_TI_TPS65090 is not set
 # CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
+# CONFIG_DRIVERS_USB_ACPI is not set
 # CONFIG_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_COMMONLIB_STORAGE is not set
 
@@ -579,10 +571,11 @@ CONFIG_DRIVERS_RICOH_RCE822=y
 #
 # Trusted Platform Module
 #
-# CONFIG_TPM is not set
-# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
-CONFIG_MAINBOARD_HAS_LPC_TPM=y
-# CONFIG_MAINBOARD_HAS_TPM2 is not set
+CONFIG_TPM1=y
+CONFIG_MAINBOARD_HAS_TPM1=y
+# CONFIG_TPM_DEACTIVATE is not set
+# CONFIG_DEBUG_TPM is not set
+# CONFIG_TPM_RDRESP_NEED_DELAY is not set
 CONFIG_ACPI_SATA_GENERATOR=y
 CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
 # CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
@@ -591,10 +584,12 @@ CONFIG_BOOT_DEVICE_SPI_FLASH=y
 CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
 # CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 CONFIG_RTC=y
+CONFIG_STACK_SIZE=0x1000
 
 #
 # Console
 #
+CONFIG_POSTCAR_CONSOLE=y
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set