diff --git a/x230/09b883f352_free.config b/x230/free-config-717f4d5e14
similarity index 91%
rename from x230/09b883f352_free.config
rename to x230/free-config-717f4d5e14
index 133935c..593f5cb 100644
--- a/x230/09b883f352_free.config
+++ b/x230/free-config-717f4d5e14
@@ -24,6 +24,7 @@ CONFIG_COLLECT_TIMESTAMPS=y
 # CONFIG_USE_BLOBS is not set
 # 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,28 +37,24 @@ 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_CAVIUM 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
+# CONFIG_VENDOR_FACEBOOK is not set
 # CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
 # CONFIG_VENDOR_GIGABYTE is not set
@@ -67,16 +64,13 @@ 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_OPENCELLULAR is not set
 # CONFIG_VENDOR_PACKARDBELL is not set
 # CONFIG_VENDOR_PCENGINES is not set
 # CONFIG_VENDOR_PURISM is not set
@@ -86,60 +80,58 @@ 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 is not set
-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
-# CONFIG_HAVE_IFD_BIN is not set
-# CONFIG_HAVE_ME_BIN is not set
 CONFIG_DRAM_RESET_GATE_GPIO=10
 CONFIG_DEVICETREE="devicetree.cb"
+CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
+CONFIG_GFX_GMA_CPU_VARIANT="Normal"
+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_IFD_BIOS_SECTION=""
-CONFIG_IFD_ME_SECTION=""
-# CONFIG_VBOOT is not set
 CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
 CONFIG_FMDFILE=""
-CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
+CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_HAVE_INTEL_FIRMWARE=y
 # CONFIG_DRIVERS_UART_8250IO is not set
-CONFIG_IFD_GBE_SECTION=""
+# CONFIG_VBOOT is not set
+CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_TPM_PIRQ=0x0
+CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+# CONFIG_HAVE_IFD_BIN is not set
 # CONFIG_BOARD_LENOVO_G505S is not set
 # CONFIG_BOARD_LENOVO_L520 is not set
-# CONFIG_BOARD_LENOVO_R400 is not set
 # CONFIG_BOARD_LENOVO_S230U is not set
 # CONFIG_BOARD_LENOVO_T400 is not set
+# CONFIG_BOARD_LENOVO_T500 is not set
+# CONFIG_BOARD_LENOVO_R400 is not set
+# CONFIG_BOARD_LENOVO_W500 is not set
 # CONFIG_BOARD_LENOVO_T420 is not set
 # CONFIG_BOARD_LENOVO_T420S is not set
 # CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
 # CONFIG_BOARD_LENOVO_T430S is not set
-# CONFIG_BOARD_LENOVO_T500 is not set
 # 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 +143,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
@@ -185,24 +178,25 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 # SoC
 #
 CONFIG_CPU_SPECIFIC_OPTIONS=y
-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_SOC_CAVIUM_CN81XX is not set
+CONFIG_ARCH_ARMV8_EXTENSION=0
+CONFIG_STACK_SIZE=0x1000
+# CONFIG_SOC_CAVIUM_COMMON is not set
 CONFIG_BOOTBLOCK_CPU_INIT="cpu/intel/model_206ax/bootblock.c"
 # CONFIG_SOC_INTEL_GLK is not set
-CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
-CONFIG_BUILD_WITH_FAKE_IFD=y
 CONFIG_IED_REGION_SIZE=0x400000
 CONFIG_PCIEXP_ASPM=y
 CONFIG_PCIEXP_COMMON_CLOCK=y
@@ -210,13 +204,13 @@ 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_SOC_INTEL_COFFEELAKE is not set
+# CONFIG_SOC_INTEL_CANNONLAKE_PCH_H is not set
 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
@@ -232,13 +226,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
@@ -261,6 +255,7 @@ CONFIG_TSC_SYNC_MFENCE=y
 CONFIG_LOGICAL_CPUS=y
 CONFIG_SMM_TSEG=y
 CONFIG_SMM_MODULE_HEAP_SIZE=0x4000
+CONFIG_SMM_STUB_STACK_SIZE=0x400
 # CONFIG_SMM_LAPIC_REMAP_MITIGATION is not set
 # CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
@@ -268,7 +263,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
@@ -285,19 +280,13 @@ 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_IF_NATIVE_VGA_INIT=y
-CONFIG_HPET_ADDRESS=0xfed00000
-CONFIG_HPET_MIN_TICKS=0x80
 CONFIG_MAX_PIRQ_LINKS=4
 
 #
@@ -306,12 +295,14 @@ 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
 # CONFIG_LOCK_SPI_FLASH_RO is not set
 # CONFIG_LOCK_SPI_FLASH_NO_ACCESS is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
 CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
 CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
 CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
@@ -319,6 +310,9 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
 CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
 CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
 CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_ACPI_MADT=y
+CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
+CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
 CONFIG_INTEL_CHIPSET_LOCKDOWN=y
 # CONFIG_LOCK_MANAGEMENT_ENGINE is not set
 
@@ -331,18 +325,23 @@ CONFIG_INTEL_CHIPSET_LOCKDOWN=y
 # Embedded Controllers
 #
 CONFIG_EC_ACPI=y
+# CONFIG_EC_GOOGLE_WILCO is not set
+CONFIG_EC_BASE_ACPI_DATA=0x930
+CONFIG_EC_BASE_ACPI_COMMAND=0x934
+CONFIG_EC_BASE_HOST_DATA=0x940
+CONFIG_EC_BASE_HOST_COMMAND=0x944
+CONFIG_EC_BASE_PACKET=0x950
 CONFIG_EC_LENOVO_H8=y
 CONFIG_SEABIOS_PS2_TIMEOUT=3000
 # CONFIG_H8_BEEP_ON_DEATH is not set
 CONFIG_H8_FLASH_LEDS_ON_DEATH=y
 # CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
 CONFIG_EC_LENOVO_PMH7=y
-CONFIG_HAVE_INTEL_FIRMWARE=y
 
 #
 # Intel Firmware
 #
-CONFIG_IFD_PLATFORM_SECTION=""
+# CONFIG_CAVIUM_BDK is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 # CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
@@ -382,7 +381,6 @@ CONFIG_UDK_VERSION=2013
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
-CONFIG_ARCH_ARMV8_EXTENSION=0
 # CONFIG_ARM64_USE_ARCH_TIMER is not set
 # CONFIG_ARM64_A53_ERRATUM_843419 is not set
 # CONFIG_ARCH_MIPS is not set
@@ -396,24 +394,27 @@ CONFIG_ARCH_ARMV8_EXTENSION=0
 # CONFIG_ARCH_ROMSTAGE_POWER8 is not set
 # CONFIG_ARCH_RAMSTAGE_POWER8 is not set
 # CONFIG_ARCH_RISCV is not set
-# CONFIG_ARCH_RISCV_COMPRESSED is not set
 # CONFIG_ARCH_BOOTBLOCK_RISCV is not set
 # CONFIG_ARCH_VERSTAGE_RISCV is not set
 # CONFIG_ARCH_ROMSTAGE_RISCV is not set
 # CONFIG_ARCH_RAMSTAGE_RISCV is not set
+# CONFIG_RISCV_USE_ARCH_TIMER is not set
 CONFIG_ARCH_X86=y
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
 CONFIG_ARCH_ROMSTAGE_X86_32=y
+CONFIG_ARCH_POSTCAR_X86_32=y
 CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_ARCH_BOOTBLOCK_X86_64 is not set
 # CONFIG_ARCH_VERSTAGE_X86_64 is not set
 # CONFIG_ARCH_ROMSTAGE_X86_64 is not set
+# CONFIG_ARCH_POSTCAR_X86_64 is not set
 # CONFIG_ARCH_RAMSTAGE_X86_64 is not set
 # CONFIG_USE_MARCH_586 is not set
 # CONFIG_AP_IN_SIPI_WAIT is not set
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
-# CONFIG_ROMCC is not set
+CONFIG_RAMBASE=0xe00000
+CONFIG_RAMTOP=0x1000000
 # CONFIG_CBMEM_TOP_BACKUP is not set
 # CONFIG_LATE_CBMEM_INIT is not set
 # CONFIG_EARLY_EBDA_INIT is not set
@@ -424,8 +425,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
@@ -435,6 +438,7 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 CONFIG_COLLECT_TIMESTAMPS_TSC=y
 # CONFIG_PAGING_IN_CACHE_AS_RAM is not set
 # CONFIG_IDT_IN_EVERY_STAGE is not set
+CONFIG_HAVE_CF9_RESET=y
 
 #
 # Devices
@@ -453,10 +457,12 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 #
 # Display
 #
-CONFIG_VGA_TEXT_FRAMEBUFFER=y
-# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
+# CONFIG_VGA_TEXT_FRAMEBUFFER is not set
+CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
+CONFIG_LINEAR_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
@@ -466,7 +472,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
 
 #
@@ -488,7 +495,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
@@ -503,7 +509,7 @@ CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B is not set
 # CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
-# CONFIG_DRIVERS_UART is not set
+CONFIG_TPM_INIT=y
 CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
@@ -515,6 +521,7 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
+# CONFIG_VPD is not set
 # CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_MAX98373 is not set
@@ -524,8 +531,10 @@ CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
 # CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 # CONFIG_DRIVERS_I2C_RX6110SA is not set
+# CONFIG_DRIVERS_I2C_SX9310 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=y
@@ -535,7 +544,6 @@ CONFIG_INTEL_GMA_ACPI=y
 # CONFIG_INTEL_GMA_SWSMISCI is not set
 CONFIG_GFX_GMA=y
 CONFIG_GFX_GMA_CPU="Ivybridge"
-CONFIG_GFX_GMA_CPU_VARIANT="Normal"
 # CONFIG_GFX_GMA_INTERNAL_IS_EDP is not set
 CONFIG_GFX_GMA_INTERNAL_IS_LVDS=y
 CONFIG_GFX_GMA_INTERNAL_PORT="LVDS"
@@ -549,7 +557,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
@@ -559,6 +569,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
 
@@ -573,10 +584,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
@@ -589,6 +601,7 @@ CONFIG_RTC=y
 #
 # Console
 #
+CONFIG_POSTCAR_CONSOLE=y
 CONFIG_SQUELCH_EARLY_SMP=y
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
@@ -609,7 +622,6 @@ CONFIG_HWBASE_DEBUG_CB=y
 CONFIG_HAVE_ACPI_RESUME=y
 # CONFIG_ACPI_HUGE_LOWMEM_BACKUP is not set
 CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-CONFIG_HAVE_HARD_RESET=y
 # CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK is not set
@@ -642,8 +654,10 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 # CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
+# CONFIG_PAYLOAD_LINUXBOOT is not set
 CONFIG_PAYLOAD_SEABIOS=y
 # CONFIG_PAYLOAD_UBOOT is not set
+# CONFIG_PAYLOAD_YABITS is not set
 # CONFIG_PAYLOAD_LINUX is not set
 # CONFIG_PAYLOAD_TIANOCORE is not set
 CONFIG_PAYLOAD_FILE="payloads/external/SeaBIOS/seabios/out/bios.bin.elf"
@@ -653,6 +667,7 @@ CONFIG_SEABIOS_STABLE=y
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
 CONFIG_SEABIOS_VGA_COREBOOT=y
 CONFIG_SEABIOS_BOOTORDER_FILE=""
+# CONFIG_SEABIOS_ADD_SERCON_PORT_FILE is not set
 CONFIG_PAYLOAD_VGABIOS_FILE="payloads/external/SeaBIOS/seabios/out/vgabios.bin"
 CONFIG_SEABIOS_DEBUG_LEVEL=-1
 
@@ -664,6 +679,7 @@ CONFIG_PAYLOAD_OPTIONS=""
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_COMPRESSED_PAYLOAD_LZ4 is not set
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
+# CONFIG_PAYLOAD_FIT_SUPPORT is not set
 CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
 
 #
@@ -692,6 +708,7 @@ CONFIG_HAVE_DEBUG_SMBUS=y
 # CONFIG_TRACE is not set
 # CONFIG_DEBUG_BOOT_STATE is not set
 # CONFIG_DEBUG_ADA_CODE is not set
+# CONFIG_HAVE_EM100_SUPPORT is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set