diff --git a/coreboot b/coreboot
index 15eec6a..d06f9c7 160000
--- a/coreboot
+++ b/coreboot
@@ -1 +1 @@
-Subproject commit 15eec6ad44bfaa0d18235d108593387751daa7f2
+Subproject commit d06f9c769921d56f5109ec5a96b7a01c1011525d
diff --git a/models/darp5/coreboot.config b/models/darp5/coreboot.config
index bc6e094..ff4b37b 100644
--- a/models/darp5/coreboot.config
+++ b/models/darp5/coreboot.config
@@ -49,6 +49,7 @@ CONFIG_TSEG_STAGE_CACHE=y
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_CAVIUM is not set
 # CONFIG_VENDOR_COMPULAB is not set
+# CONFIG_VENDOR_DELL is not set
 # CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_FACEBOOK is not set
@@ -124,6 +125,9 @@ CONFIG_IFD_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/fd.rom"
 CONFIG_ME_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/me.rom"
 # CONFIG_CONSOLE_SERIAL is not set
 CONFIG_TPM_PIRQ=0x0
+CONFIG_PCIEXP_HOTPLUG_BUSES=32
+CONFIG_PCIEXP_HOTPLUG_MEM=0x2000000
+CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x20000000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Darter Pro"
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_ADD_FSP_BINARIES=y
@@ -196,6 +200,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 #
 CONFIG_CPU_SPECIFIC_OPTIONS=y
 CONFIG_CPU_ADDR_BITS=36
+CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_CONSOLE_UART_BASE_ADDRESS=0xfe032000
 CONFIG_SMM_TSEG_SIZE=0x800000
 CONFIG_SMM_RESERVED_SIZE=0x200000
@@ -213,7 +218,6 @@ CONFIG_PCR_BASE_ADDRESS=0xfd000000
 CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_CLOCK_MHZ=120
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
-CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_FSP_HEADER_PATH="3rdparty/fsp/CoffeeLakeFspBinPkg/Include/"
 CONFIG_FSP_FD_PATH="3rdparty/fsp/CoffeeLakeFspBinPkg/Fsp.fd"
 # CONFIG_NHLT_DMIC_1CH_16B is not set
@@ -272,6 +276,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_ITSS_POL_CFG=y
 # CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_MULTI_ACPI_DEVICES is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_DUAL_ROUTE_SUPPORT=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_GRAPHICS=y
+CONFIG_SOC_INTEL_CONFIGURE_DDI_A_4_LANES=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_VERSION_2=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_HDA=y
@@ -286,6 +291,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_PCR=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_PMC=y
 # CONFIG_PMC_INVALID_READ_AFTER_WRITE is not set
 CONFIG_PMC_GLOBAL_RESET_ENABLE_LOCK=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_POWER_LIMIT=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_RTC=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SATA=y
 CONFIG_SOC_AHCI_PORT_IMPLEMENTED_INVERT=y
@@ -534,15 +540,16 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_PCIEXP_HOTPLUG=y
-CONFIG_PCIEXP_HOTPLUG_BUSES=32
-CONFIG_PCIEXP_HOTPLUG_MEM=0x2000000
-CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x20000000
+CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_ABOVE_4G=y
+# CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G is not set
 CONFIG_PCIEXP_HOTPLUG_IO=0x2000
 # CONFIG_EARLY_PCI_BRIDGE is not set
 # CONFIG_CHECK_REV_IN_OPROM_NAME is not set
 CONFIG_INTEL_GMA_HAVE_VBT=y
 CONFIG_INTEL_GMA_ADD_VBT=y
 # CONFIG_SOFTWARE_I2C is not set
+# CONFIG_RESOURCE_ALLOCATOR_V3 is not set
+CONFIG_RESOURCE_ALLOCATOR_V4=y
 
 #
 # Generic Drivers
@@ -595,7 +602,10 @@ CONFIG_DRIVERS_GENERIC_WIFI=y
 # CONFIG_DRIVERS_GFX_GENERIC is not set
 CONFIG_DRIVERS_I2C_DESIGNWARE=y
 # CONFIG_DRIVERS_I2C_DESIGNWARE_DEBUG is not set
+CONFIG_DRIVERS_I2C_GENERIC=y
+CONFIG_DRIVERS_I2C_HID=y
 # CONFIG_DRIVERS_I2C_MAX98373 is not set
+# CONFIG_DRIVERS_I2C_MAX98390 is not set
 # CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCA9538 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
@@ -630,6 +640,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
 # CONFIG_DRIVER_INTEL_I210 is not set
 # CONFIG_DRIVERS_INTEL_ISH is not set
 # CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_PMC is not set
 # CONFIG_HAVE_INTEL_PTT is not set
 # CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
diff --git a/models/darp6/coreboot.config b/models/darp6/coreboot.config
index a51908d..a75b3b6 100644
--- a/models/darp6/coreboot.config
+++ b/models/darp6/coreboot.config
@@ -242,8 +242,8 @@ CONFIG_SOC_INTEL_COMETLAKE=y
 CONFIG_MAX_ROOT_PORTS=16
 CONFIG_MAX_PCIE_CLOCKS=6
 # CONFIG_MB_HAS_ACTIVE_HIGH_SD_PWR_ENABLE is not set
-# CONFIG_USE_CANNONLAKE_CAR_NEM_ENHANCED is not set
-CONFIG_USE_CANNONLAKE_FSP_CAR=y
+CONFIG_USE_CANNONLAKE_CAR_NEM_ENHANCED=y
+# CONFIG_USE_CANNONLAKE_FSP_CAR is not set
 CONFIG_SOC_INTEL_CANNONLAKE_DEBUG_CONSENT=0
 CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000
 CONFIG_UART_PCI_ADDR=0x0
@@ -259,10 +259,10 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_ACPI=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_CHIP_CONFIG=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_CPU=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_CPU_MPINIT=y
-# CONFIG_SOC_INTEL_COMMON_BLOCK_CAR is not set
+CONFIG_SOC_INTEL_COMMON_BLOCK_CAR=y
 # CONFIG_INTEL_CAR_NEM is not set
 # CONFIG_INTEL_CAR_CQOS is not set
-# CONFIG_INTEL_CAR_NEM_ENHANCED is not set
+CONFIG_INTEL_CAR_NEM_ENHANCED=y
 # CONFIG_USE_INTEL_FSP_MP_INIT is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_CSE=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_DSP=y
@@ -384,8 +384,7 @@ CONFIG_UDELAY_TSC=y
 CONFIG_TSC_MONOTONIC_TIMER=y
 # CONFIG_TSC_SYNC_LFENCE is not set
 # CONFIG_TSC_SYNC_MFENCE is not set
-# CONFIG_NO_FIXED_XIP_ROM_SIZE is not set
-CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_NO_FIXED_XIP_ROM_SIZE=y
 CONFIG_LOGICAL_CPUS=y
 CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_NO_SMM is not set
@@ -625,10 +624,8 @@ CONFIG_FSP_USE_REPO=y
 CONFIG_PLATFORM_USES_FSP2_0=y
 # CONFIG_PLATFORM_USES_FSP2_1 is not set
 CONFIG_HAVE_INTEL_FSP_REPO=y
-CONFIG_FSP_T_CBFS="fspt.bin"
-CONFIG_FSP_T_FILE="$(obj)/Fsp_T.fd"
-CONFIG_FSP_CAR=y
-CONFIG_FSP_T_XIP=y
+# CONFIG_FSP_CAR is not set
+# CONFIG_FSP_T_XIP is not set
 CONFIG_FSP_USES_CB_STACK=y
 CONFIG_HAVE_FSP_LOGO_SUPPORT=y
 # CONFIG_FSP2_0_DISPLAY_LOGO is not set
diff --git a/models/galp2/coreboot.config b/models/galp2/coreboot.config
index 406cac8..011beda 100644
--- a/models/galp2/coreboot.config
+++ b/models/galp2/coreboot.config
@@ -22,10 +22,11 @@ CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_COLLECT_TIMESTAMPS=y
 # CONFIG_TIMESTAMPS_ON_CONSOLE is not set
 CONFIG_USE_BLOBS=y
+# CONFIG_USE_AMD_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_NO_STAGE_CACHE is not set
 CONFIG_TSEG_STAGE_CACHE=y
 # CONFIG_UPDATE_IMAGE is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
@@ -37,22 +38,20 @@ CONFIG_TSEG_STAGE_CACHE=y
 #
 # Important: Run 'make distclean' before switching boards
 #
-# CONFIG_VENDOR_ADI is not set
+# CONFIG_VENDOR_51NB 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_ASROCK is not set
 # CONFIG_VENDOR_ASUS is not set
-# CONFIG_VENDOR_AVALUE is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_CAVIUM is not set
 # CONFIG_VENDOR_COMPULAB is not set
+# CONFIG_VENDOR_DELL 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
@@ -61,11 +60,11 @@ CONFIG_TSEG_STAGE_CACHE=y
 # CONFIG_VENDOR_GOOGLE is not set
 # CONFIG_VENDOR_HP is not set
 # CONFIG_VENDOR_IBASE is not set
-# CONFIG_VENDOR_IEI is not set
 # CONFIG_VENDOR_INTEL is not set
 # CONFIG_VENDOR_JETWAY is not set
 # CONFIG_VENDOR_KONTRON is not set
 # CONFIG_VENDOR_LENOVO is not set
+# CONFIG_VENDOR_LIBRETREND is not set
 # CONFIG_VENDOR_LIPPERT is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_OCP is not set
@@ -73,6 +72,7 @@ CONFIG_TSEG_STAGE_CACHE=y
 # CONFIG_VENDOR_PACKARDBELL is not set
 # CONFIG_VENDOR_PCENGINES is not set
 # CONFIG_VENDOR_PORTWELL is not set
+# CONFIG_VENDOR_PROTECTLI is not set
 # CONFIG_VENDOR_PURISM is not set
 # CONFIG_VENDOR_RAZER is not set
 # CONFIG_VENDOR_RODA is not set
@@ -84,20 +84,20 @@ CONFIG_TSEG_STAGE_CACHE=y
 # CONFIG_VENDOR_SUPERMICRO is not set
 CONFIG_VENDOR_SYSTEM76=y
 # CONFIG_VENDOR_TI is not set
-# CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_UP is not set
-# CONFIG_VENDOR_VIA is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
-CONFIG_MAINBOARD_DIR="system76/kbl-u"
 CONFIG_MAINBOARD_PART_NUMBER="galp2"
+CONFIG_MAINBOARD_VERSION="galp2"
+CONFIG_MAINBOARD_DIR="system76/kbl-u"
 CONFIG_MAX_CPUS=8
-CONFIG_CBFS_SIZE=0x600000
-CONFIG_MAINBOARD_VENDOR="System76"
 CONFIG_VGA_BIOS_ID="8086,5916"
-CONFIG_ONBOARD_VGA_IS_PRIMARY=y
+CONFIG_DIMM_MAX=2
 CONFIG_DIMM_SPD_SIZE=512
+CONFIG_FMDFILE=""
+# CONFIG_NO_POST is not set
+CONFIG_MAINBOARD_VENDOR="System76"
+CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 # CONFIG_VGA_BIOS is not set
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
 CONFIG_VGA_BIOS_FILE="pci8086,5916.rom"
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0xC000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="System76"
@@ -105,61 +105,65 @@ CONFIG_VARIANT_DIR="galp2"
 CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_INTEL_GMA_VBT_FILE="$(FIRMWARE_OPEN_MODEL_DIR)/vbt.rom"
 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_CBFS_SIZE=0x600000
 # CONFIG_POST_IO is not set
-CONFIG_DCACHE_RAM_BASE=0xfef00000
-CONFIG_DCACHE_RAM_SIZE=0x40000
-CONFIG_MAX_REBOOT_CNT=3
 CONFIG_OVERRIDE_DEVICETREE=""
 CONFIG_ME_CLEANER_ARGS="-S"
 CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_FMDFILE=""
+CONFIG_UART_FOR_CONSOLE=2
+# CONFIG_VBOOT is not set
+CONFIG_DCACHE_RAM_BASE=0xfef00000
+CONFIG_DCACHE_RAM_SIZE=0x40000
 CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
 CONFIG_MMCONF_BASE_ADDRESS=0xe0000000
+CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
-# CONFIG_POST_DEVICE is not set
 CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 # CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS is not set
 CONFIG_TPM_INIT=y
-# CONFIG_VBOOT is not set
-# CONFIG_DRIVERS_UART_8250IO is not set
-CONFIG_DIMM_MAX=2
-CONFIG_TPM_PIRQ=0x0
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Galago Pro"
+CONFIG_DRIVERS_INTEL_WIFI=y
 CONFIG_IFD_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/fd.rom"
 CONFIG_ME_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/me.rom"
+CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y
+CONFIG_MAINBOARD_SUPPORTS_KABYLAKE_QUAD=y
+# CONFIG_CONSOLE_SERIAL is not set
+CONFIG_TPM_PIRQ=0x0
+CONFIG_PCIEXP_HOTPLUG_BUSES=32
+CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
+CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Galago Pro"
+# CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_ENABLE is not set
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_ADD_FSP_BINARIES=y
 CONFIG_FSP_M_FILE="$(obj)/Fsp_M.fd"
 CONFIG_FSP_S_FILE="$(obj)/Fsp_S.fd"
 CONFIG_FSP_S_CBFS="fsps.bin"
 CONFIG_FSP_M_CBFS="fspm.bin"
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7
-CONFIG_MAINBOARD_VERSION="galp2"
-# CONFIG_DRIVERS_PS2_KEYBOARD is not set
-CONFIG_DRIVERS_INTEL_WIFI=y
+CONFIG_PS2K_EISAID="PNP0303"
+CONFIG_PS2M_EISAID="PNP0F13"
+CONFIG_PXE_ROM_ID="10ec,8168"
+# CONFIG_DRIVERS_UART_8250IO is not set
 CONFIG_PCIEXP_L1_SUB_STATE=y
 CONFIG_SMBIOS_ENCLOSURE_TYPE=0x09
 CONFIG_HEAP_SIZE=0x80000
 CONFIG_CONSOLE_POST=y
+# CONFIG_POST_DEVICE is not set
 # CONFIG_BOARD_SYSTEM76_GAZE14_1650_15 is not set
 # CONFIG_BOARD_SYSTEM76_GAZE14_1650_17 is not set
 # CONFIG_BOARD_SYSTEM76_GAZE14_1660TI_15 is not set
 # CONFIG_BOARD_SYSTEM76_GAZE14_1660TI_17 is not set
 # CONFIG_BOARD_SYSTEM76_GALP4 is not set
 # CONFIG_BOARD_SYSTEM76_DARP6 is not set
-# CONFIG_BOARD_SYSTEM76_GALP2 is not set
 CONFIG_BOARD_SYSTEM76_GALP2=y
 # CONFIG_BOARD_SYSTEM76_GALP3 is not set
 # CONFIG_BOARD_SYSTEM76_GALP3_B is not set
+# CONFIG_BOARD_SYSTEM76_LEMP9 is not set
 # CONFIG_BOARD_SYSTEM76_THELIO_B1 is not set
 # CONFIG_BOARD_SYSTEM76_GALP3_C is not set
 # CONFIG_BOARD_SYSTEM76_DARP5 is not set
-CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID=0x1558
-CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x1303
-CONFIG_PXE_ROM_ID="10ec,8168"
 CONFIG_FSP_M_XIP=y
-CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
-CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
+CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
+CONFIG_SUBSYSTEM_DEVICE_ID=0x1303
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
@@ -168,6 +172,7 @@ CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_1024 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_5120 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_6144 is not set
 CONFIG_COREBOOT_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
@@ -176,7 +181,7 @@ CONFIG_COREBOOT_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=8192
-CONFIG_ROM_SIZE=0x800000
+CONFIG_ROM_SIZE=0x00800000
 CONFIG_HAVE_POWER_STATE_AFTER_FAILURE=y
 CONFIG_HAVE_POWER_STATE_PREVIOUS_AFTER_FAILURE=y
 CONFIG_POWER_STATE_DEFAULT_ON_AFTER_FAILURE=y
@@ -198,13 +203,15 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 # SoC
 #
 CONFIG_CPU_SPECIFIC_OPTIONS=y
-CONFIG_HAVE_BOOTBLOCK=y
 CONFIG_CPU_ADDR_BITS=36
+CONFIG_VERSTAGE_ADDR=0x2000000
+CONFIG_CONSOLE_UART_BASE_ADDRESS=0xfe030000
 CONFIG_SMM_TSEG_SIZE=0x800000
 CONFIG_SMM_RESERVED_SIZE=0x200000
 CONFIG_SMM_MODULE_STACK_SIZE=0x800
-CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
+CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
 CONFIG_DRIVERS_I2C_DESIGNWARE_CLOCK_MHZ=120
+CONFIG_X86_RESET_VECTOR=0xfffffff0
 # CONFIG_SOC_CAVIUM_CN81XX is not set
 CONFIG_ARCH_ARMV8_EXTENSION=0
 CONFIG_STACK_SIZE=0x1000
@@ -214,7 +221,6 @@ CONFIG_PCR_BASE_ADDRESS=0xfd000000
 CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_CLOCK_MHZ=120
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
-CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
 CONFIG_FSP_FD_PATH="3rdparty/fsp/KabylakeFspBinPkg/Fsp.fd"
 # CONFIG_NHLT_MAX98357 is not set
@@ -225,7 +231,6 @@ CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x30
 CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL=0xc35
 CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_MAX=2
 CONFIG_SOC_INTEL_I2C_DEV_MAX=6
-# CONFIG_RESET_ON_INVALID_RAMSTAGE_CACHE is not set
 CONFIG_PCIEXP_ASPM=y
 CONFIG_PCIEXP_COMMON_CLOCK=y
 CONFIG_PCIEXP_CLK_PM=y
@@ -233,13 +238,11 @@ CONFIG_IED_REGION_SIZE=0x400000
 # CONFIG_NHLT_MAX98373 is not set
 CONFIG_MAX_ROOT_PORTS=24
 CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000
-CONFIG_FSP_HYPERTHREADING=y
 CONFIG_UART_PCI_ADDR=0x0
 CONFIG_SOC_INTEL_COMMON_SKYLAKE_BASE=y
 CONFIG_SOC_INTEL_KABYLAKE=y
+CONFIG_FSP_HYPERTHREADING=y
 CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
-CONFIG_MAINBOARD_USES_FSP2_0=y
-CONFIG_USE_FSP2_0_DRIVER=y
 # CONFIG_EXCLUDE_NATIVE_SD_INTERFACE is not set
 # CONFIG_SKYLAKE_SOC_PCH_H is not set
 # CONFIG_NHLT_DMIC_2CH is not set
@@ -250,6 +253,8 @@ CONFIG_USE_FSP2_0_DRIVER=y
 # CONFIG_NHLT_RT5663 is not set
 # CONFIG_NHLT_MAX98927 is not set
 # CONFIG_NO_FADT_8042 is not set
+CONFIG_MAINBOARD_SUPPORTS_KABYLAKE_DUAL=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_P2SB=y
 CONFIG_SOC_INTEL_COMMON=y
 
 #
@@ -266,7 +271,6 @@ CONFIG_INTEL_CAR_NEM_ENHANCED=y
 # CONFIG_USE_INTEL_FSP_MP_INIT is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_CSE=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_DSP=y
-CONFIG_SOC_INTEL_COMMON_BLOCK_EBDA=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_FAST_SPI=y
 CONFIG_FAST_SPI_DISABLE_WRITE_STATUS=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO=y
@@ -277,7 +281,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_LEGACY_MACROS=y
 # CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_MULTI_ACPI_DEVICES is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_DUAL_ROUTE_SUPPORT=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_GRAPHICS=y
-# CONFIG_SKIP_GRAPHICS_ENABLING is not set
+CONFIG_SOC_INTEL_CONFIGURE_DDI_A_4_LANES=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI=y
 # CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_VERSION_2 is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_HDA=y
@@ -287,36 +291,45 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_I2C=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_ITSS=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_LPC=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_LPSS=y
-CONFIG_SOC_INTEL_COMMON_BLOCK_P2SB=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_PCIE=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_PCR=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_PMC=y
 # CONFIG_PMC_INVALID_READ_AFTER_WRITE is not set
 CONFIG_PMC_GLOBAL_RESET_ENABLE_LOCK=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_POWER_LIMIT=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_RTC=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SATA=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SCS=y
 # CONFIG_SOC_INTEL_COMMON_EARLY_MMC_WAKE is not set
 # CONFIG_SOC_INTEL_COMMON_MMC_OVERRIDE is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_SGX=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_LOCK_MEMORY=y
+# CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_MAX is not set
+# CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_256MB is not set
+# CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_128MB is not set
+# CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_64MB is not set
+# CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_32MB is not set
+# CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_1MB is not set
+CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_DISABLED=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SMBUS=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_TCO=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_TCO_ENABLE_THROUGH_SMBUS=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SMM=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
 # CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_ESPI_DISABLE is not set
+# CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_TCO_ENABLE is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
 # CONFIG_HECI_DISABLE_USING_SMM is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_SPI=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SA=y
-CONFIG_SA_PCIEX_LENGTH=0x4000000
-CONFIG_PCIEX_LENGTH_64MB=y
+CONFIG_SA_PCIEX_LENGTH=0x10000000
 # CONFIG_SA_ENABLE_IMR is not set
 CONFIG_SA_ENABLE_DPR=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_THERMAL=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_TIMER=y
 CONFIG_USE_LEGACY_8254_TIMER=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_UART=y
+CONFIG_INTEL_LPSS_UART_FOR_CONSOLE=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_XDCI=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG=y
@@ -346,6 +359,7 @@ CONFIG_SOC_INTEL_COMMON_NHLT=y
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_SOC_QUALCOMM_QCS405 is not set
+# CONFIG_SOC_QUALCOMM_SC7180 is not set
 # CONFIG_SOC_QUALCOMM_SDM845 is not set
 # CONFIG_SOC_ROCKCHIP_RK3288 is not set
 # CONFIG_SOC_ROCKCHIP_RK3399 is not set
@@ -356,7 +370,6 @@ CONFIG_SOC_INTEL_COMMON_NHLT=y
 #
 # CPU
 #
-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
@@ -366,6 +379,8 @@ CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE=y
 CONFIG_CPU_INTEL_COMMON=y
 CONFIG_ENABLE_VMX=y
 CONFIG_SET_IA32_FC_LOCK_BIT=y
+CONFIG_CPU_INTEL_COMMON_HYPERTHREADING=y
+CONFIG_CPU_INTEL_COMMON_SMM=y
 CONFIG_MICROCODE_UPDATE_PRE_RAM=y
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
@@ -373,7 +388,6 @@ CONFIG_PARALLEL_MP=y
 CONFIG_PARALLEL_MP_AP_WORK=y
 # CONFIG_UDELAY_LAPIC is not set
 CONFIG_UDELAY_TSC=y
-CONFIG_TSC_CONSTANT_RATE=y
 CONFIG_TSC_MONOTONIC_TIMER=y
 # CONFIG_TSC_SYNC_LFENCE is not set
 CONFIG_TSC_SYNC_MFENCE=y
@@ -389,9 +403,7 @@ CONFIG_SMM_STUB_STACK_SIZE=0x400
 # CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
 # CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_SSE=y
 CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
@@ -407,21 +419,28 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
+CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
+CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
 
 #
 # Southbridge
 #
 # CONFIG_AMD_SB_CIMX is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE is not set
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9 is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
 # CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG is not set
 CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
 CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
@@ -431,12 +450,15 @@ CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #
 # CONFIG_SUPERIO_ASPEED_AST2400 is not set
 # CONFIG_SUPERIO_ASPEED_COMMON_PRE_RAM is not set
+# CONFIG_SUPERIO_ASPEED_HAS_UART_DELAY_WORKAROUND is not set
 # CONFIG_SUPERIO_FINTEK_FAN_CONTROL is not set
 
 #
 # Embedded Controllers
 #
 CONFIG_EC_ACPI=y
+# CONFIG_EC_51NB_NPCE985LA0DX is not set
+# CONFIG_EC_GOOGLE_CHROMEEC_SKUID is not set
 # CONFIG_EC_GOOGLE_WILCO is not set
 
 #
@@ -472,21 +494,16 @@ 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_RAMBASE=0xe00000
 CONFIG_RAMTOP=0x1000000
+CONFIG_NUM_IPI_STARTS=2
 # CONFIG_CBMEM_TOP_BACKUP is not set
-CONFIG_EARLY_EBDA_INIT=y
 CONFIG_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
-# CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
 CONFIG_HAVE_CMOS_DEFAULT=y
 CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
@@ -497,7 +514,8 @@ CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POSTCAR_STAGE=y
 # CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
 # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
-CONFIG_ACPI_HAVE_PCAT_8259=y
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
 # CONFIG_COLLECT_TIMESTAMPS_NO_TSC is not set
 CONFIG_COLLECT_TIMESTAMPS_TSC=y
 # CONFIG_PAGING_IN_CACHE_AS_RAM is not set
@@ -523,20 +541,27 @@ CONFIG_RUN_FSP_GOP=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 # CONFIG_BOOTSPLASH is not set
-# 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_HT_CHAIN_UNITID_BASE=0
+CONFIG_HT_CHAIN_END_UNITID_BASE=0
 CONFIG_PCIX_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_PCIEXP_HOTPLUG=y
+CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_ABOVE_4G=y
+# CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G is not set
+CONFIG_PCIEXP_HOTPLUG_IO=0x2000
 # CONFIG_EARLY_PCI_BRIDGE is not set
+# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
 CONFIG_INTEL_GMA_HAVE_VBT=y
 CONFIG_INTEL_GMA_ADD_VBT=y
 # CONFIG_SOFTWARE_I2C is not set
+# CONFIG_RESOURCE_ALLOCATOR_V3 is not set
+CONFIG_RESOURCE_ALLOCATOR_V4=y
 
 #
 # Generic Drivers
@@ -551,10 +576,10 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
 CONFIG_CACHE_MRC_SETTINGS=y
 CONFIG_MRC_SETTINGS_PROTECT=y
 # CONFIG_HAS_RECOVERY_MRC_CACHE is not set
-# CONFIG_MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN is not set
 # CONFIG_MRC_SETTINGS_VARIABLE_DATA is not set
 # CONFIG_MRC_WRITE_NV_LATE is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
+# CONFIG_RT8168_SUPPORT_LEGACY_VPD_MAC is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 CONFIG_SMMSTORE=y
 # CONFIG_SMMSTORE_IN_CBFS is not set
@@ -562,20 +587,21 @@ CONFIG_SMMSTORE_REGION="SMMSTORE"
 CONFIG_SMMSTORE_FILENAME="smm_store"
 CONFIG_SMMSTORE_SIZE=0x40000
 CONFIG_SPI_FLASH=y
+# CONFIG_SPI_SDCARD is not set
 CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
 CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
+CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_SMM=y
 # CONFIG_SPI_FLASH_NO_FAST_READ is not set
-# 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=y
 CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
-# CONFIG_DRIVERS_UART_8250MEM is not set
-# CONFIG_DRIVERS_UART_8250MEM_32 is not set
+CONFIG_DRIVERS_UART_8250MEM=y
+CONFIG_DRIVERS_UART_8250MEM_32=y
 # CONFIG_HAVE_UART_SPECIAL is not set
-# CONFIG_DRIVERS_UART_OXPCIE is not set
 # CONFIG_DRIVERS_UART_PL011 is not set
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 # CONFIG_HAVE_USBDEBUG is not set
@@ -584,12 +610,17 @@ CONFIG_NO_UART_ON_SUPERIO=y
 CONFIG_DRIVERS_GENERIC_WIFI=y
 # CONFIG_USE_SAR is not set
 # CONFIG_DRIVERS_AMD_PI is not set
+# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
+# CONFIG_DRIVERS_GFX_GENERIC is not set
 CONFIG_DRIVERS_I2C_DESIGNWARE=y
 # CONFIG_DRIVERS_I2C_DESIGNWARE_DEBUG is not set
 # CONFIG_DRIVERS_I2C_MAX98373 is not set
+# CONFIG_DRIVERS_I2C_MAX98390 is not set
 # CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCA9538 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_PTN3460 is not set
+# CONFIG_DRIVERS_I2C_RT1011 is not set
 # CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 # CONFIG_DRIVERS_I2C_RX6110SA is not set
@@ -597,34 +628,35 @@ CONFIG_DRIVERS_I2C_DESIGNWARE=y
 # 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_FSP1_0 is not set
 CONFIG_FSP_USE_REPO=y
 # CONFIG_DISPLAY_HOBS is not set
 # CONFIG_DISPLAY_UPD_DATA is not set
 CONFIG_PLATFORM_USES_FSP2_0=y
 # CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_DISPLAY_FSP_CALLS_AND_STATUS is not set
-# CONFIG_DISPLAY_FSP_HEADER is not set
+CONFIG_HAVE_INTEL_FSP_REPO=y
 # CONFIG_FSP_CAR is not set
 # CONFIG_FSP_T_XIP is not set
 # CONFIG_FSP_USES_CB_STACK is not set
-# CONFIG_VERIFY_HOBS is not set
-# CONFIG_DISPLAY_FSP_VERSION_INFO is not set
+CONFIG_HAVE_FSP_LOGO_SUPPORT=y
+# CONFIG_FSP2_0_DISPLAY_LOGO is not set
 # CONFIG_INTEL_DDI is not set
 # CONFIG_INTEL_EDID is not set
 # CONFIG_INTEL_INT15 is not set
 CONFIG_INTEL_GMA_ACPI=y
+CONFIG_INTEL_GMA_BCLV_WIDTH=16
+CONFIG_INTEL_GMA_BCLM_WIDTH=16
 # CONFIG_INTEL_GMA_SSC_ALTERNATE_REF is not set
 # CONFIG_INTEL_GMA_SWSMISCI is not set
 # CONFIG_DRIVER_INTEL_I210 is not set
+# CONFIG_DRIVERS_INTEL_ISH is not set
 # CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_PMC is not set
 # CONFIG_HAVE_INTEL_PTT is not set
 # CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
-# CONFIG_UDELAY_IO is not set
-# CONFIG_UDELAY_TIMER2 is not set
+# CONFIG_DRIVERS_PS2_KEYBOARD is not set
 CONFIG_DRIVERS_MC146818=y
 CONFIG_LPC_TPM=y
 CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
@@ -634,8 +666,8 @@ CONFIG_MAINBOARD_HAS_LPC_TPM=y
 # CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
 # CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM is not set
 # 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_COMMONLIB_STORAGE is not set
@@ -655,20 +687,22 @@ CONFIG_TPM2=y
 CONFIG_MAINBOARD_HAS_TPM2=y
 CONFIG_DEBUG_TPM=y
 # CONFIG_TPM_RDRESP_NEED_DELAY is not set
+# CONFIG_TPM_MEASURED_BOOT is not set
 
 #
 # Memory initialization
 #
 CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
 # CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT is not set
-
-#
-# Intel
-#
 # CONFIG_INTEL_TXT is not set
-# CONFIG_ACPI_SATA_GENERATOR is not set
-CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
+# CONFIG_STM is not set
+CONFIG_BOOTMEDIA_LOCK_NONE=y
+# CONFIG_BOOTMEDIA_LOCK_CONTROLLER is not set
+# CONFIG_BOOTMEDIA_LOCK_CHIP is not set
 # CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
+CONFIG_ACPI_HAVE_PCAT_8259=y
+CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
+CONFIG_HAVE_ACPI_TABLES=y
 # CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
 CONFIG_BOOT_DEVICE_SPI_FLASH=y
 CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
@@ -681,6 +715,7 @@ CONFIG_RTC=y
 CONFIG_BOOTBLOCK_CONSOLE=y
 CONFIG_POSTCAR_CONSOLE=y
 CONFIG_SQUELCH_EARLY_SMP=y
+CONFIG_FIXED_UART_FOR_CONSOLE=y
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
@@ -696,15 +731,14 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_2 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
-# CONFIG_NO_POST is not set
+CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7
 # CONFIG_CMOS_POST is not set
+# CONFIG_DEFAULT_POST_ON_LPC is not set
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
 CONFIG_HWBASE_DEBUG_CB=y
 CONFIG_HAVE_ACPI_RESUME=y
+# CONFIG_DISABLE_ACPI_HIBERNATE is not set
 CONFIG_RESUME_PATH_SAME_AS_BOOT=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
 # CONFIG_NO_MONOTONIC_TIMER is not set
 CONFIG_HAVE_MONOTONIC_TIMER=y
 # CONFIG_TIMER_QUEUE is not set
@@ -713,7 +747,6 @@ CONFIG_HAVE_OPTION_TABLE=y
 CONFIG_IOAPIC=y
 # CONFIG_USE_WATCHDOG_ON_BOOT is not set
 # CONFIG_GFXUMA is not set
-CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_COMMON_FADT=y
 CONFIG_ACPI_NHLT=y
 
@@ -724,13 +757,13 @@ CONFIG_ACPI_NHLT=y
 # CONFIG_GENERATE_PIRQ_TABLE is not set
 CONFIG_GENERATE_SMBIOS_TABLES=y
 # CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
 
 #
 # Payload
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=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
@@ -742,12 +775,7 @@ CONFIG_PAYLOAD_ELF=y
 CONFIG_PAYLOAD_FILE="$(FIRMWARE_OPEN_UEFIPAYLOAD)"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
-# CONFIG_TIANOCORE_COREBOOTPAYLOAD is not set
-# CONFIG_TIANOCORE_UEFIPAYLOAD is not set
-# CONFIG_TIANOCORE_TARGET_IA32 is not set
-# CONFIG_TIANOCORE_TARGET_X64 is not set
-# CONFIG_TIANOCORE_DEBUG is not set
-# CONFIG_TIANOCORE_RELEASE is not set
+# CONFIG_COMPRESSED_PAYLOAD_NONE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_COMPRESSED_PAYLOAD_LZ4 is not set
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
@@ -771,18 +799,27 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
 CONFIG_HAVE_DISPLAY_MTRRS=y
 # CONFIG_DISPLAY_MTRRS is not set
 
+#
+# BLOB Debug Settings
+#
+# CONFIG_DISPLAY_FSP_CALLS_AND_STATUS is not set
+# CONFIG_DISPLAY_FSP_HEADER is not set
+# CONFIG_VERIFY_HOBS is not set
+# CONFIG_DISPLAY_FSP_VERSION_INFO is not set
+
 #
 # General Debug Settings
 #
+# CONFIG_GDB_STUB is not set
 # CONFIG_FATAL_ASSERTS is not set
 CONFIG_HAVE_DEBUG_GPIO=y
 # CONFIG_DEBUG_GPIO is not set
 # CONFIG_DEBUG_CBFS is not set
 # CONFIG_HAVE_DEBUG_RAM_SETUP is not set
-# CONFIG_HAVE_DEBUG_SMBUS is not set
+CONFIG_HAVE_DEBUG_SMBUS=y
+# CONFIG_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_SMI is not set
 # CONFIG_DEBUG_MALLOC is not set
-# CONFIG_DEBUG_ACPI is not set
 # CONFIG_DEBUG_CONSOLE_INIT is not set
 # CONFIG_DEBUG_SPI_FLASH is not set
 # CONFIG_TRACE is not set
@@ -792,7 +829,6 @@ CONFIG_HAVE_EM100_SUPPORT=y
 # CONFIG_EM100 is not set
 CONFIG_NO_EDID_FILL_FB=y
 CONFIG_SPD_READ_BY_WORD=y
-# CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
@@ -800,11 +836,11 @@ CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
 # CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
 CONFIG_REG_SCRIPT=y
+CONFIG_MAX_REBOOT_CNT=3
 # CONFIG_NO_XIP_EARLY_STAGES is not set
 # CONFIG_EARLY_CBMEM_LIST is not set
 CONFIG_RELOCATABLE_MODULES=y
 CONFIG_GENERIC_GPIO_LIB=y
-CONFIG_C_ENVIRONMENT_BOOTBLOCK=y
+CONFIG_HAVE_BOOTBLOCK=y
 CONFIG_HAVE_ROMSTAGE=y
-CONFIG_HAVE_POSTCAR=y
 CONFIG_HAVE_RAMSTAGE=y
diff --git a/models/galp3-b/coreboot.config b/models/galp3-b/coreboot.config
index e71c43f..f69e9b5 100644
--- a/models/galp3-b/coreboot.config
+++ b/models/galp3-b/coreboot.config
@@ -25,8 +25,8 @@ CONFIG_USE_BLOBS=y
 # CONFIG_USE_AMD_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_NO_STAGE_CACHE is not set
 CONFIG_TSEG_STAGE_CACHE=y
 # CONFIG_UPDATE_IMAGE is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
@@ -38,22 +38,20 @@ CONFIG_TSEG_STAGE_CACHE=y
 #
 # Important: Run 'make distclean' before switching boards
 #
-# CONFIG_VENDOR_ADI is not set
+# CONFIG_VENDOR_51NB 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_ASROCK is not set
 # CONFIG_VENDOR_ASUS is not set
-# CONFIG_VENDOR_AVALUE is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_CAVIUM is not set
 # CONFIG_VENDOR_COMPULAB is not set
+# CONFIG_VENDOR_DELL 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
@@ -62,11 +60,11 @@ CONFIG_TSEG_STAGE_CACHE=y
 # CONFIG_VENDOR_GOOGLE is not set
 # CONFIG_VENDOR_HP is not set
 # CONFIG_VENDOR_IBASE is not set
-# CONFIG_VENDOR_IEI is not set
 # CONFIG_VENDOR_INTEL is not set
 # CONFIG_VENDOR_JETWAY is not set
 # CONFIG_VENDOR_KONTRON is not set
 # CONFIG_VENDOR_LENOVO is not set
+# CONFIG_VENDOR_LIBRETREND is not set
 # CONFIG_VENDOR_LIPPERT is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_OCP is not set
@@ -74,6 +72,7 @@ CONFIG_TSEG_STAGE_CACHE=y
 # CONFIG_VENDOR_PACKARDBELL is not set
 # CONFIG_VENDOR_PCENGINES is not set
 # CONFIG_VENDOR_PORTWELL is not set
+# CONFIG_VENDOR_PROTECTLI is not set
 # CONFIG_VENDOR_PURISM is not set
 # CONFIG_VENDOR_RAZER is not set
 # CONFIG_VENDOR_RODA is not set
@@ -85,21 +84,20 @@ CONFIG_TSEG_STAGE_CACHE=y
 # CONFIG_VENDOR_SUPERMICRO is not set
 CONFIG_VENDOR_SYSTEM76=y
 # CONFIG_VENDOR_TI is not set
-# CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_UP is not set
-# CONFIG_VENDOR_VIA is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
-CONFIG_MAINBOARD_DIR="system76/kbl-u"
 CONFIG_MAINBOARD_PART_NUMBER="galp3-b"
+CONFIG_MAINBOARD_VERSION="galp3-b"
+CONFIG_MAINBOARD_DIR="system76/kbl-u"
 CONFIG_MAX_CPUS=8
-CONFIG_CBFS_SIZE=0x600000
-CONFIG_UART_FOR_CONSOLE=2
-CONFIG_MAINBOARD_VENDOR="System76"
 CONFIG_VGA_BIOS_ID="8086,5917"
-CONFIG_ONBOARD_VGA_IS_PRIMARY=y
+CONFIG_DIMM_MAX=2
 CONFIG_DIMM_SPD_SIZE=512
+CONFIG_FMDFILE=""
+# CONFIG_NO_POST is not set
+CONFIG_MAINBOARD_VENDOR="System76"
+CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 # CONFIG_VGA_BIOS is not set
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
 CONFIG_VGA_BIOS_FILE="pci8086,5917.rom"
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0xC000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="System76"
@@ -107,43 +105,49 @@ CONFIG_VARIANT_DIR="galp3-b"
 CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_INTEL_GMA_VBT_FILE="$(FIRMWARE_OPEN_MODEL_DIR)/vbt.rom"
 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_CBFS_SIZE=0x600000
 # CONFIG_POST_IO is not set
-CONFIG_DCACHE_RAM_BASE=0xfef00000
-CONFIG_DCACHE_RAM_SIZE=0x40000
-CONFIG_MAX_REBOOT_CNT=3
 CONFIG_OVERRIDE_DEVICETREE=""
 CONFIG_ME_CLEANER_ARGS="-S"
 CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_FMDFILE=""
+CONFIG_UART_FOR_CONSOLE=2
+# CONFIG_VBOOT is not set
+CONFIG_DCACHE_RAM_BASE=0xfef00000
+CONFIG_DCACHE_RAM_SIZE=0x40000
 CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
 CONFIG_MMCONF_BASE_ADDRESS=0xe0000000
+CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
-# CONFIG_POST_DEVICE is not set
 CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 # CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS is not set
 CONFIG_TPM_INIT=y
 CONFIG_DRIVERS_INTEL_WIFI=y
-# CONFIG_VBOOT is not set
-# CONFIG_DRIVERS_UART_8250IO is not set
-CONFIG_DIMM_MAX=2
-CONFIG_TPM_PIRQ=0x0
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Galago Pro"
 CONFIG_IFD_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/fd.rom"
 CONFIG_ME_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/me.rom"
+CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y
+CONFIG_MAINBOARD_SUPPORTS_KABYLAKE_QUAD=y
+# CONFIG_CONSOLE_SERIAL is not set
+CONFIG_TPM_PIRQ=0x0
+CONFIG_PCIEXP_HOTPLUG_BUSES=32
+CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
+CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Galago Pro"
+# CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_ENABLE is not set
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_ADD_FSP_BINARIES=y
 CONFIG_FSP_M_FILE="$(obj)/Fsp_M.fd"
 CONFIG_FSP_S_FILE="$(obj)/Fsp_S.fd"
 CONFIG_FSP_S_CBFS="fsps.bin"
 CONFIG_FSP_M_CBFS="fspm.bin"
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7
-CONFIG_MAINBOARD_VERSION="galp3-b"
-# CONFIG_DRIVERS_PS2_KEYBOARD is not set
+CONFIG_PS2K_EISAID="PNP0303"
+CONFIG_PS2M_EISAID="PNP0F13"
+CONFIG_PXE_ROM_ID="10ec,8168"
+# CONFIG_DRIVERS_UART_8250IO is not set
 CONFIG_PCIEXP_L1_SUB_STATE=y
-# CONFIG_NO_POST is not set
 CONFIG_SMBIOS_ENCLOSURE_TYPE=0x09
 CONFIG_HEAP_SIZE=0x80000
 CONFIG_CONSOLE_POST=y
+# CONFIG_POST_DEVICE is not set
 # CONFIG_BOARD_SYSTEM76_GAZE14_1650_15 is not set
 # CONFIG_BOARD_SYSTEM76_GAZE14_1650_17 is not set
 # CONFIG_BOARD_SYSTEM76_GAZE14_1660TI_15 is not set
@@ -153,10 +157,10 @@ CONFIG_CONSOLE_POST=y
 # CONFIG_BOARD_SYSTEM76_GALP2 is not set
 # CONFIG_BOARD_SYSTEM76_GALP3 is not set
 CONFIG_BOARD_SYSTEM76_GALP3_B=y
+# CONFIG_BOARD_SYSTEM76_LEMP9 is not set
 # CONFIG_BOARD_SYSTEM76_THELIO_B1 is not set
 # CONFIG_BOARD_SYSTEM76_GALP3_C is not set
 # CONFIG_BOARD_SYSTEM76_DARP5 is not set
-CONFIG_PXE_ROM_ID="10ec,8168"
 CONFIG_FSP_M_XIP=y
 CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
 CONFIG_SUBSYSTEM_DEVICE_ID=0x1413
@@ -168,6 +172,7 @@ CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_1024 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_5120 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_6144 is not set
 CONFIG_COREBOOT_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
@@ -176,7 +181,7 @@ CONFIG_COREBOOT_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=8192
-CONFIG_ROM_SIZE=0x800000
+CONFIG_ROM_SIZE=0x00800000
 CONFIG_HAVE_POWER_STATE_AFTER_FAILURE=y
 CONFIG_HAVE_POWER_STATE_PREVIOUS_AFTER_FAILURE=y
 CONFIG_POWER_STATE_DEFAULT_ON_AFTER_FAILURE=y
@@ -198,13 +203,15 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 # SoC
 #
 CONFIG_CPU_SPECIFIC_OPTIONS=y
-CONFIG_HAVE_BOOTBLOCK=y
 CONFIG_CPU_ADDR_BITS=36
+CONFIG_VERSTAGE_ADDR=0x2000000
+CONFIG_CONSOLE_UART_BASE_ADDRESS=0xfe030000
 CONFIG_SMM_TSEG_SIZE=0x800000
 CONFIG_SMM_RESERVED_SIZE=0x200000
 CONFIG_SMM_MODULE_STACK_SIZE=0x800
-CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
+CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
 CONFIG_DRIVERS_I2C_DESIGNWARE_CLOCK_MHZ=120
+CONFIG_X86_RESET_VECTOR=0xfffffff0
 # CONFIG_SOC_CAVIUM_CN81XX is not set
 CONFIG_ARCH_ARMV8_EXTENSION=0
 CONFIG_STACK_SIZE=0x1000
@@ -214,7 +221,6 @@ CONFIG_PCR_BASE_ADDRESS=0xfd000000
 CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_CLOCK_MHZ=120
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
-CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
 CONFIG_FSP_FD_PATH="3rdparty/fsp/KabylakeFspBinPkg/Fsp.fd"
 # CONFIG_NHLT_MAX98357 is not set
@@ -225,7 +231,6 @@ CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x30
 CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL=0xc35
 CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_MAX=2
 CONFIG_SOC_INTEL_I2C_DEV_MAX=6
-# CONFIG_RESET_ON_INVALID_RAMSTAGE_CACHE is not set
 CONFIG_PCIEXP_ASPM=y
 CONFIG_PCIEXP_COMMON_CLOCK=y
 CONFIG_PCIEXP_CLK_PM=y
@@ -233,10 +238,10 @@ CONFIG_IED_REGION_SIZE=0x400000
 # CONFIG_NHLT_MAX98373 is not set
 CONFIG_MAX_ROOT_PORTS=24
 CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000
-CONFIG_FSP_HYPERTHREADING=y
 CONFIG_UART_PCI_ADDR=0x0
 CONFIG_SOC_INTEL_COMMON_SKYLAKE_BASE=y
 CONFIG_SOC_INTEL_KABYLAKE=y
+CONFIG_FSP_HYPERTHREADING=y
 CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
 # CONFIG_EXCLUDE_NATIVE_SD_INTERFACE is not set
 # CONFIG_SKYLAKE_SOC_PCH_H is not set
@@ -248,6 +253,8 @@ CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
 # CONFIG_NHLT_RT5663 is not set
 # CONFIG_NHLT_MAX98927 is not set
 # CONFIG_NO_FADT_8042 is not set
+CONFIG_MAINBOARD_SUPPORTS_KABYLAKE_DUAL=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_P2SB=y
 CONFIG_SOC_INTEL_COMMON=y
 
 #
@@ -264,7 +271,6 @@ CONFIG_INTEL_CAR_NEM_ENHANCED=y
 # CONFIG_USE_INTEL_FSP_MP_INIT is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_CSE=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_DSP=y
-CONFIG_SOC_INTEL_COMMON_BLOCK_EBDA=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_FAST_SPI=y
 CONFIG_FAST_SPI_DISABLE_WRITE_STATUS=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO=y
@@ -275,7 +281,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_LEGACY_MACROS=y
 # CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_MULTI_ACPI_DEVICES is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_DUAL_ROUTE_SUPPORT=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_GRAPHICS=y
-# CONFIG_SKIP_GRAPHICS_ENABLING is not set
+CONFIG_SOC_INTEL_CONFIGURE_DDI_A_4_LANES=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI=y
 # CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_VERSION_2 is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_HDA=y
@@ -285,12 +291,12 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_I2C=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_ITSS=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_LPC=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_LPSS=y
-CONFIG_SOC_INTEL_COMMON_BLOCK_P2SB=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_PCIE=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_PCR=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_PMC=y
 # CONFIG_PMC_INVALID_READ_AFTER_WRITE is not set
 CONFIG_PMC_GLOBAL_RESET_ENABLE_LOCK=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_POWER_LIMIT=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_RTC=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SATA=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SCS=y
@@ -298,24 +304,32 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SCS=y
 # CONFIG_SOC_INTEL_COMMON_MMC_OVERRIDE is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_SGX=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_LOCK_MEMORY=y
+# CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_MAX is not set
+# CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_256MB is not set
+# CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_128MB is not set
+# CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_64MB is not set
+# CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_32MB is not set
+# CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_1MB is not set
+CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_DISABLED=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SMBUS=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_TCO=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_TCO_ENABLE_THROUGH_SMBUS=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SMM=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
 # CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_ESPI_DISABLE is not set
+# CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_TCO_ENABLE is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
 # CONFIG_HECI_DISABLE_USING_SMM is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_SPI=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SA=y
-CONFIG_SA_PCIEX_LENGTH=0x4000000
-CONFIG_PCIEX_LENGTH_64MB=y
+CONFIG_SA_PCIEX_LENGTH=0x10000000
 # CONFIG_SA_ENABLE_IMR is not set
 CONFIG_SA_ENABLE_DPR=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_THERMAL=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_TIMER=y
 CONFIG_USE_LEGACY_8254_TIMER=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_UART=y
+CONFIG_INTEL_LPSS_UART_FOR_CONSOLE=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_XDCI=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG=y
@@ -356,7 +370,6 @@ CONFIG_SOC_INTEL_COMMON_NHLT=y
 #
 # CPU
 #
-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
@@ -367,6 +380,7 @@ CONFIG_CPU_INTEL_COMMON=y
 CONFIG_ENABLE_VMX=y
 CONFIG_SET_IA32_FC_LOCK_BIT=y
 CONFIG_CPU_INTEL_COMMON_HYPERTHREADING=y
+CONFIG_CPU_INTEL_COMMON_SMM=y
 CONFIG_MICROCODE_UPDATE_PRE_RAM=y
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
@@ -389,9 +403,7 @@ CONFIG_SMM_STUB_STACK_SIZE=0x400
 # CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
 # CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_SSE=y
 CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
@@ -407,21 +419,28 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
+CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
+CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
 
 #
 # Southbridge
 #
 # CONFIG_AMD_SB_CIMX is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE is not set
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9 is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
 # CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG is not set
 CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
 CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
@@ -438,6 +457,8 @@ CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 # Embedded Controllers
 #
 CONFIG_EC_ACPI=y
+# CONFIG_EC_51NB_NPCE985LA0DX is not set
+# CONFIG_EC_GOOGLE_CHROMEEC_SKUID is not set
 # CONFIG_EC_GOOGLE_WILCO is not set
 
 #
@@ -473,18 +494,14 @@ 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_RAMBASE=0xe00000
 CONFIG_RAMTOP=0x1000000
+CONFIG_NUM_IPI_STARTS=2
 # CONFIG_CBMEM_TOP_BACKUP is not set
-CONFIG_EARLY_EBDA_INIT=y
 CONFIG_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
 CONFIG_HAVE_CMOS_DEFAULT=y
@@ -497,7 +514,8 @@ CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POSTCAR_STAGE=y
 # CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
 # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
-CONFIG_ACPI_HAVE_PCAT_8259=y
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
 # CONFIG_COLLECT_TIMESTAMPS_NO_TSC is not set
 CONFIG_COLLECT_TIMESTAMPS_TSC=y
 # CONFIG_PAGING_IN_CACHE_AS_RAM is not set
@@ -523,20 +541,27 @@ CONFIG_RUN_FSP_GOP=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 # CONFIG_BOOTSPLASH is not set
-# 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_HT_CHAIN_UNITID_BASE=0
+CONFIG_HT_CHAIN_END_UNITID_BASE=0
 CONFIG_PCIX_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_PCIEXP_HOTPLUG=y
+CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_ABOVE_4G=y
+# CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G is not set
+CONFIG_PCIEXP_HOTPLUG_IO=0x2000
 # CONFIG_EARLY_PCI_BRIDGE is not set
+# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
 CONFIG_INTEL_GMA_HAVE_VBT=y
 CONFIG_INTEL_GMA_ADD_VBT=y
 # CONFIG_SOFTWARE_I2C is not set
+# CONFIG_RESOURCE_ALLOCATOR_V3 is not set
+CONFIG_RESOURCE_ALLOCATOR_V4=y
 
 #
 # Generic Drivers
@@ -551,10 +576,10 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
 CONFIG_CACHE_MRC_SETTINGS=y
 CONFIG_MRC_SETTINGS_PROTECT=y
 # CONFIG_HAS_RECOVERY_MRC_CACHE is not set
-# CONFIG_MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN is not set
 # CONFIG_MRC_SETTINGS_VARIABLE_DATA is not set
 # CONFIG_MRC_WRITE_NV_LATE is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
+# CONFIG_RT8168_SUPPORT_LEGACY_VPD_MAC is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 CONFIG_SMMSTORE=y
 # CONFIG_SMMSTORE_IN_CBFS is not set
@@ -562,20 +587,21 @@ CONFIG_SMMSTORE_REGION="SMMSTORE"
 CONFIG_SMMSTORE_FILENAME="smm_store"
 CONFIG_SMMSTORE_SIZE=0x40000
 CONFIG_SPI_FLASH=y
+# CONFIG_SPI_SDCARD is not set
 CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
 CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
+CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_SMM=y
 # CONFIG_SPI_FLASH_NO_FAST_READ is not set
-# 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=y
 CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
-# CONFIG_DRIVERS_UART_8250MEM is not set
-# CONFIG_DRIVERS_UART_8250MEM_32 is not set
+CONFIG_DRIVERS_UART_8250MEM=y
+CONFIG_DRIVERS_UART_8250MEM_32=y
 # CONFIG_HAVE_UART_SPECIAL is not set
-# CONFIG_DRIVERS_UART_OXPCIE is not set
 # CONFIG_DRIVERS_UART_PL011 is not set
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 # CONFIG_HAVE_USBDEBUG is not set
@@ -584,12 +610,16 @@ CONFIG_NO_UART_ON_SUPERIO=y
 CONFIG_DRIVERS_GENERIC_WIFI=y
 # CONFIG_USE_SAR is not set
 # CONFIG_DRIVERS_AMD_PI is not set
+# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
+# CONFIG_DRIVERS_GFX_GENERIC is not set
 CONFIG_DRIVERS_I2C_DESIGNWARE=y
 # CONFIG_DRIVERS_I2C_DESIGNWARE_DEBUG is not set
 # CONFIG_DRIVERS_I2C_MAX98373 is not set
+# CONFIG_DRIVERS_I2C_MAX98390 is not set
 # CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCA9538 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_PTN3460 is not set
 # CONFIG_DRIVERS_I2C_RT1011 is not set
 # CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
@@ -598,34 +628,35 @@ CONFIG_DRIVERS_I2C_DESIGNWARE=y
 # 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_FSP1_0 is not set
 CONFIG_FSP_USE_REPO=y
 # CONFIG_DISPLAY_HOBS is not set
 # CONFIG_DISPLAY_UPD_DATA is not set
 CONFIG_PLATFORM_USES_FSP2_0=y
 # CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_DISPLAY_FSP_CALLS_AND_STATUS is not set
-# CONFIG_DISPLAY_FSP_HEADER is not set
+CONFIG_HAVE_INTEL_FSP_REPO=y
 # CONFIG_FSP_CAR is not set
 # CONFIG_FSP_T_XIP is not set
 # CONFIG_FSP_USES_CB_STACK is not set
-# CONFIG_VERIFY_HOBS is not set
-# CONFIG_DISPLAY_FSP_VERSION_INFO is not set
+CONFIG_HAVE_FSP_LOGO_SUPPORT=y
+# CONFIG_FSP2_0_DISPLAY_LOGO is not set
 # CONFIG_INTEL_DDI is not set
 # CONFIG_INTEL_EDID is not set
 # CONFIG_INTEL_INT15 is not set
 CONFIG_INTEL_GMA_ACPI=y
+CONFIG_INTEL_GMA_BCLV_WIDTH=16
+CONFIG_INTEL_GMA_BCLM_WIDTH=16
 # CONFIG_INTEL_GMA_SSC_ALTERNATE_REF is not set
 # CONFIG_INTEL_GMA_SWSMISCI is not set
 # CONFIG_DRIVER_INTEL_I210 is not set
+# CONFIG_DRIVERS_INTEL_ISH is not set
 # CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_PMC is not set
 # CONFIG_HAVE_INTEL_PTT is not set
 # CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
-# CONFIG_UDELAY_IO is not set
-# CONFIG_UDELAY_TIMER2 is not set
+# CONFIG_DRIVERS_PS2_KEYBOARD is not set
 CONFIG_DRIVERS_MC146818=y
 CONFIG_LPC_TPM=y
 CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
@@ -635,8 +666,8 @@ CONFIG_MAINBOARD_HAS_LPC_TPM=y
 # CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
 # CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM is not set
 # 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_COMMONLIB_STORAGE is not set
@@ -656,20 +687,22 @@ CONFIG_TPM2=y
 CONFIG_MAINBOARD_HAS_TPM2=y
 CONFIG_DEBUG_TPM=y
 # CONFIG_TPM_RDRESP_NEED_DELAY is not set
+# CONFIG_TPM_MEASURED_BOOT is not set
 
 #
 # Memory initialization
 #
 CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
 # CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT is not set
-
-#
-# Intel
-#
 # CONFIG_INTEL_TXT is not set
-# CONFIG_ACPI_SATA_GENERATOR is not set
-CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
+# CONFIG_STM is not set
+CONFIG_BOOTMEDIA_LOCK_NONE=y
+# CONFIG_BOOTMEDIA_LOCK_CONTROLLER is not set
+# CONFIG_BOOTMEDIA_LOCK_CHIP is not set
 # CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
+CONFIG_ACPI_HAVE_PCAT_8259=y
+CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
+CONFIG_HAVE_ACPI_TABLES=y
 # CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
 CONFIG_BOOT_DEVICE_SPI_FLASH=y
 CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
@@ -682,6 +715,7 @@ CONFIG_RTC=y
 CONFIG_BOOTBLOCK_CONSOLE=y
 CONFIG_POSTCAR_CONSOLE=y
 CONFIG_SQUELCH_EARLY_SMP=y
+CONFIG_FIXED_UART_FOR_CONSOLE=y
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
@@ -697,14 +731,14 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_2 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
+CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7
 # CONFIG_CMOS_POST is not set
+# CONFIG_DEFAULT_POST_ON_LPC is not set
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
 CONFIG_HWBASE_DEBUG_CB=y
 CONFIG_HAVE_ACPI_RESUME=y
+# CONFIG_DISABLE_ACPI_HIBERNATE is not set
 CONFIG_RESUME_PATH_SAME_AS_BOOT=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
 # CONFIG_NO_MONOTONIC_TIMER is not set
 CONFIG_HAVE_MONOTONIC_TIMER=y
 # CONFIG_TIMER_QUEUE is not set
@@ -713,7 +747,6 @@ CONFIG_HAVE_OPTION_TABLE=y
 CONFIG_IOAPIC=y
 # CONFIG_USE_WATCHDOG_ON_BOOT is not set
 # CONFIG_GFXUMA is not set
-CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_COMMON_FADT=y
 CONFIG_ACPI_NHLT=y
 
@@ -724,13 +757,13 @@ CONFIG_ACPI_NHLT=y
 # CONFIG_GENERATE_PIRQ_TABLE is not set
 CONFIG_GENERATE_SMBIOS_TABLES=y
 # CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
 
 #
 # Payload
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=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
@@ -742,6 +775,7 @@ CONFIG_PAYLOAD_ELF=y
 CONFIG_PAYLOAD_FILE="$(FIRMWARE_OPEN_UEFIPAYLOAD)"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
+# CONFIG_COMPRESSED_PAYLOAD_NONE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_COMPRESSED_PAYLOAD_LZ4 is not set
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
@@ -765,18 +799,27 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
 CONFIG_HAVE_DISPLAY_MTRRS=y
 # CONFIG_DISPLAY_MTRRS is not set
 
+#
+# BLOB Debug Settings
+#
+# CONFIG_DISPLAY_FSP_CALLS_AND_STATUS is not set
+# CONFIG_DISPLAY_FSP_HEADER is not set
+# CONFIG_VERIFY_HOBS is not set
+# CONFIG_DISPLAY_FSP_VERSION_INFO is not set
+
 #
 # General Debug Settings
 #
+# CONFIG_GDB_STUB is not set
 # CONFIG_FATAL_ASSERTS is not set
 CONFIG_HAVE_DEBUG_GPIO=y
 # CONFIG_DEBUG_GPIO is not set
 # CONFIG_DEBUG_CBFS is not set
 # CONFIG_HAVE_DEBUG_RAM_SETUP is not set
-# CONFIG_HAVE_DEBUG_SMBUS is not set
+CONFIG_HAVE_DEBUG_SMBUS=y
+# CONFIG_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_SMI is not set
 # CONFIG_DEBUG_MALLOC is not set
-# CONFIG_DEBUG_ACPI is not set
 # CONFIG_DEBUG_CONSOLE_INIT is not set
 # CONFIG_DEBUG_SPI_FLASH is not set
 # CONFIG_TRACE is not set
@@ -785,9 +828,7 @@ CONFIG_HAVE_DEBUG_GPIO=y
 CONFIG_HAVE_EM100_SUPPORT=y
 # CONFIG_EM100 is not set
 CONFIG_NO_EDID_FILL_FB=y
-CONFIG_RAMSTAGE_CBMEM_TOP_ARG=y
 CONFIG_SPD_READ_BY_WORD=y
-# CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
@@ -795,10 +836,11 @@ CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
 # CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
 CONFIG_REG_SCRIPT=y
+CONFIG_MAX_REBOOT_CNT=3
 # CONFIG_NO_XIP_EARLY_STAGES is not set
 # CONFIG_EARLY_CBMEM_LIST is not set
 CONFIG_RELOCATABLE_MODULES=y
 CONFIG_GENERIC_GPIO_LIB=y
-CONFIG_C_ENVIRONMENT_BOOTBLOCK=y
+CONFIG_HAVE_BOOTBLOCK=y
 CONFIG_HAVE_ROMSTAGE=y
 CONFIG_HAVE_RAMSTAGE=y
diff --git a/models/galp3-c/coreboot.config b/models/galp3-c/coreboot.config
index f5ec671..bb85b8a 100644
--- a/models/galp3-c/coreboot.config
+++ b/models/galp3-c/coreboot.config
@@ -49,6 +49,7 @@ CONFIG_TSEG_STAGE_CACHE=y
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_CAVIUM is not set
 # CONFIG_VENDOR_COMPULAB is not set
+# CONFIG_VENDOR_DELL is not set
 # CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_FACEBOOK is not set
@@ -124,6 +125,9 @@ CONFIG_IFD_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/fd.rom"
 CONFIG_ME_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/me.rom"
 # CONFIG_CONSOLE_SERIAL is not set
 CONFIG_TPM_PIRQ=0x0
+CONFIG_PCIEXP_HOTPLUG_BUSES=32
+CONFIG_PCIEXP_HOTPLUG_MEM=0x2000000
+CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x20000000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Galago Pro"
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_ADD_FSP_BINARIES=y
@@ -196,6 +200,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 #
 CONFIG_CPU_SPECIFIC_OPTIONS=y
 CONFIG_CPU_ADDR_BITS=36
+CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_CONSOLE_UART_BASE_ADDRESS=0xfe032000
 CONFIG_SMM_TSEG_SIZE=0x800000
 CONFIG_SMM_RESERVED_SIZE=0x200000
@@ -213,7 +218,6 @@ CONFIG_PCR_BASE_ADDRESS=0xfd000000
 CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_CLOCK_MHZ=120
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
-CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_FSP_HEADER_PATH="3rdparty/fsp/CoffeeLakeFspBinPkg/Include/"
 CONFIG_FSP_FD_PATH="3rdparty/fsp/CoffeeLakeFspBinPkg/Fsp.fd"
 # CONFIG_NHLT_DMIC_1CH_16B is not set
@@ -272,6 +276,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_ITSS_POL_CFG=y
 # CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_MULTI_ACPI_DEVICES is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_DUAL_ROUTE_SUPPORT=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_GRAPHICS=y
+CONFIG_SOC_INTEL_CONFIGURE_DDI_A_4_LANES=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_VERSION_2=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_HDA=y
@@ -286,6 +291,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_PCR=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_PMC=y
 # CONFIG_PMC_INVALID_READ_AFTER_WRITE is not set
 CONFIG_PMC_GLOBAL_RESET_ENABLE_LOCK=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_POWER_LIMIT=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_RTC=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SATA=y
 CONFIG_SOC_AHCI_PORT_IMPLEMENTED_INVERT=y
@@ -534,15 +540,16 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_PCIEXP_HOTPLUG=y
-CONFIG_PCIEXP_HOTPLUG_BUSES=32
-CONFIG_PCIEXP_HOTPLUG_MEM=0x2000000
-CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x20000000
+CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_ABOVE_4G=y
+# CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G is not set
 CONFIG_PCIEXP_HOTPLUG_IO=0x2000
 # CONFIG_EARLY_PCI_BRIDGE is not set
 # CONFIG_CHECK_REV_IN_OPROM_NAME is not set
 CONFIG_INTEL_GMA_HAVE_VBT=y
 CONFIG_INTEL_GMA_ADD_VBT=y
 # CONFIG_SOFTWARE_I2C is not set
+# CONFIG_RESOURCE_ALLOCATOR_V3 is not set
+CONFIG_RESOURCE_ALLOCATOR_V4=y
 
 #
 # Generic Drivers
@@ -595,7 +602,10 @@ CONFIG_DRIVERS_GENERIC_WIFI=y
 # CONFIG_DRIVERS_GFX_GENERIC is not set
 CONFIG_DRIVERS_I2C_DESIGNWARE=y
 # CONFIG_DRIVERS_I2C_DESIGNWARE_DEBUG is not set
+CONFIG_DRIVERS_I2C_GENERIC=y
+CONFIG_DRIVERS_I2C_HID=y
 # CONFIG_DRIVERS_I2C_MAX98373 is not set
+# CONFIG_DRIVERS_I2C_MAX98390 is not set
 # CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCA9538 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
@@ -630,6 +640,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
 # CONFIG_DRIVER_INTEL_I210 is not set
 # CONFIG_DRIVERS_INTEL_ISH is not set
 # CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_PMC is not set
 # CONFIG_HAVE_INTEL_PTT is not set
 # CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
diff --git a/models/galp3/coreboot.config b/models/galp3/coreboot.config
index 077dcca..c0cdd72 100644
--- a/models/galp3/coreboot.config
+++ b/models/galp3/coreboot.config
@@ -22,10 +22,11 @@ CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_COLLECT_TIMESTAMPS=y
 # CONFIG_TIMESTAMPS_ON_CONSOLE is not set
 CONFIG_USE_BLOBS=y
+# CONFIG_USE_AMD_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_NO_STAGE_CACHE is not set
 CONFIG_TSEG_STAGE_CACHE=y
 # CONFIG_UPDATE_IMAGE is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
@@ -37,22 +38,20 @@ CONFIG_TSEG_STAGE_CACHE=y
 #
 # Important: Run 'make distclean' before switching boards
 #
-# CONFIG_VENDOR_ADI is not set
+# CONFIG_VENDOR_51NB 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_ASROCK is not set
 # CONFIG_VENDOR_ASUS is not set
-# CONFIG_VENDOR_AVALUE is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_CAVIUM is not set
 # CONFIG_VENDOR_COMPULAB is not set
+# CONFIG_VENDOR_DELL 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
@@ -61,11 +60,11 @@ CONFIG_TSEG_STAGE_CACHE=y
 # CONFIG_VENDOR_GOOGLE is not set
 # CONFIG_VENDOR_HP is not set
 # CONFIG_VENDOR_IBASE is not set
-# CONFIG_VENDOR_IEI is not set
 # CONFIG_VENDOR_INTEL is not set
 # CONFIG_VENDOR_JETWAY is not set
 # CONFIG_VENDOR_KONTRON is not set
 # CONFIG_VENDOR_LENOVO is not set
+# CONFIG_VENDOR_LIBRETREND is not set
 # CONFIG_VENDOR_LIPPERT is not set
 # CONFIG_VENDOR_MSI is not set
 # CONFIG_VENDOR_OCP is not set
@@ -73,6 +72,7 @@ CONFIG_TSEG_STAGE_CACHE=y
 # CONFIG_VENDOR_PACKARDBELL is not set
 # CONFIG_VENDOR_PCENGINES is not set
 # CONFIG_VENDOR_PORTWELL is not set
+# CONFIG_VENDOR_PROTECTLI is not set
 # CONFIG_VENDOR_PURISM is not set
 # CONFIG_VENDOR_RAZER is not set
 # CONFIG_VENDOR_RODA is not set
@@ -84,20 +84,20 @@ CONFIG_TSEG_STAGE_CACHE=y
 # CONFIG_VENDOR_SUPERMICRO is not set
 CONFIG_VENDOR_SYSTEM76=y
 # CONFIG_VENDOR_TI is not set
-# CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_UP is not set
-# CONFIG_VENDOR_VIA is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
-CONFIG_MAINBOARD_DIR="system76/kbl-u"
 CONFIG_MAINBOARD_PART_NUMBER="galp3"
+CONFIG_MAINBOARD_VERSION="galp3"
+CONFIG_MAINBOARD_DIR="system76/kbl-u"
 CONFIG_MAX_CPUS=8
-CONFIG_CBFS_SIZE=0x600000
-CONFIG_MAINBOARD_VENDOR="System76"
 CONFIG_VGA_BIOS_ID="8086,5917"
-CONFIG_ONBOARD_VGA_IS_PRIMARY=y
+CONFIG_DIMM_MAX=2
 CONFIG_DIMM_SPD_SIZE=512
+CONFIG_FMDFILE=""
+# CONFIG_NO_POST is not set
+CONFIG_MAINBOARD_VENDOR="System76"
+CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 # CONFIG_VGA_BIOS is not set
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
 CONFIG_VGA_BIOS_FILE="pci8086,5917.rom"
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0xC000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="System76"
@@ -105,42 +105,49 @@ CONFIG_VARIANT_DIR="galp3"
 CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_INTEL_GMA_VBT_FILE="$(FIRMWARE_OPEN_MODEL_DIR)/vbt.rom"
 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
+CONFIG_CBFS_SIZE=0x600000
 # CONFIG_POST_IO is not set
-CONFIG_DCACHE_RAM_BASE=0xfef00000
-CONFIG_DCACHE_RAM_SIZE=0x40000
-CONFIG_MAX_REBOOT_CNT=3
 CONFIG_OVERRIDE_DEVICETREE=""
 CONFIG_ME_CLEANER_ARGS="-S"
 CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-CONFIG_FMDFILE=""
+CONFIG_UART_FOR_CONSOLE=2
+# CONFIG_VBOOT is not set
+CONFIG_DCACHE_RAM_BASE=0xfef00000
+CONFIG_DCACHE_RAM_SIZE=0x40000
 CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
 CONFIG_MMCONF_BASE_ADDRESS=0xe0000000
+CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
-# CONFIG_POST_DEVICE is not set
 CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 # CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS is not set
 CONFIG_TPM_INIT=y
-# CONFIG_VBOOT is not set
-# CONFIG_DRIVERS_UART_8250IO is not set
-CONFIG_DIMM_MAX=2
-CONFIG_TPM_PIRQ=0x0
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Galago Pro"
+CONFIG_DRIVERS_INTEL_WIFI=y
 CONFIG_IFD_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/fd.rom"
 CONFIG_ME_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/me.rom"
+CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU=y
+CONFIG_MAINBOARD_SUPPORTS_KABYLAKE_QUAD=y
+# CONFIG_CONSOLE_SERIAL is not set
+CONFIG_TPM_PIRQ=0x0
+CONFIG_PCIEXP_HOTPLUG_BUSES=32
+CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
+CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Galago Pro"
+# CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_ENABLE is not set
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_ADD_FSP_BINARIES=y
 CONFIG_FSP_M_FILE="$(obj)/Fsp_M.fd"
 CONFIG_FSP_S_FILE="$(obj)/Fsp_S.fd"
 CONFIG_FSP_S_CBFS="fsps.bin"
 CONFIG_FSP_M_CBFS="fspm.bin"
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7
-CONFIG_MAINBOARD_VERSION="galp3"
-# CONFIG_DRIVERS_PS2_KEYBOARD is not set
-CONFIG_DRIVERS_INTEL_WIFI=y
+CONFIG_PS2K_EISAID="PNP0303"
+CONFIG_PS2M_EISAID="PNP0F13"
+CONFIG_PXE_ROM_ID="10ec,8168"
+# CONFIG_DRIVERS_UART_8250IO is not set
 CONFIG_PCIEXP_L1_SUB_STATE=y
 CONFIG_SMBIOS_ENCLOSURE_TYPE=0x09
 CONFIG_HEAP_SIZE=0x80000
 CONFIG_CONSOLE_POST=y
+# CONFIG_POST_DEVICE is not set
 # CONFIG_BOARD_SYSTEM76_GAZE14_1650_15 is not set
 # CONFIG_BOARD_SYSTEM76_GAZE14_1650_17 is not set
 # CONFIG_BOARD_SYSTEM76_GAZE14_1660TI_15 is not set
@@ -150,15 +157,13 @@ CONFIG_CONSOLE_POST=y
 # CONFIG_BOARD_SYSTEM76_GALP2 is not set
 CONFIG_BOARD_SYSTEM76_GALP3=y
 # CONFIG_BOARD_SYSTEM76_GALP3_B is not set
+# CONFIG_BOARD_SYSTEM76_LEMP9 is not set
 # CONFIG_BOARD_SYSTEM76_THELIO_B1 is not set
 # CONFIG_BOARD_SYSTEM76_GALP3_C is not set
 # CONFIG_BOARD_SYSTEM76_DARP5 is not set
-CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID=0x1558
-CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x1313
-CONFIG_PXE_ROM_ID="10ec,8168"
 CONFIG_FSP_M_XIP=y
-CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
-CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
+CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
+CONFIG_SUBSYSTEM_DEVICE_ID=0x1313
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
@@ -167,6 +172,7 @@ CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_1024 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_5120 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_6144 is not set
 CONFIG_COREBOOT_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
@@ -175,7 +181,7 @@ CONFIG_COREBOOT_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=8192
-CONFIG_ROM_SIZE=0x800000
+CONFIG_ROM_SIZE=0x00800000
 CONFIG_HAVE_POWER_STATE_AFTER_FAILURE=y
 CONFIG_HAVE_POWER_STATE_PREVIOUS_AFTER_FAILURE=y
 CONFIG_POWER_STATE_DEFAULT_ON_AFTER_FAILURE=y
@@ -197,13 +203,15 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 # SoC
 #
 CONFIG_CPU_SPECIFIC_OPTIONS=y
-CONFIG_HAVE_BOOTBLOCK=y
 CONFIG_CPU_ADDR_BITS=36
+CONFIG_VERSTAGE_ADDR=0x2000000
+CONFIG_CONSOLE_UART_BASE_ADDRESS=0xfe030000
 CONFIG_SMM_TSEG_SIZE=0x800000
 CONFIG_SMM_RESERVED_SIZE=0x200000
 CONFIG_SMM_MODULE_STACK_SIZE=0x800
-CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
+CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
 CONFIG_DRIVERS_I2C_DESIGNWARE_CLOCK_MHZ=120
+CONFIG_X86_RESET_VECTOR=0xfffffff0
 # CONFIG_SOC_CAVIUM_CN81XX is not set
 CONFIG_ARCH_ARMV8_EXTENSION=0
 CONFIG_STACK_SIZE=0x1000
@@ -213,7 +221,6 @@ CONFIG_PCR_BASE_ADDRESS=0xfd000000
 CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_CLOCK_MHZ=120
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
-CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
 CONFIG_FSP_FD_PATH="3rdparty/fsp/KabylakeFspBinPkg/Fsp.fd"
 # CONFIG_NHLT_MAX98357 is not set
@@ -224,7 +231,6 @@ CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x30
 CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL=0xc35
 CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_MAX=2
 CONFIG_SOC_INTEL_I2C_DEV_MAX=6
-# CONFIG_RESET_ON_INVALID_RAMSTAGE_CACHE is not set
 CONFIG_PCIEXP_ASPM=y
 CONFIG_PCIEXP_COMMON_CLOCK=y
 CONFIG_PCIEXP_CLK_PM=y
@@ -232,13 +238,11 @@ CONFIG_IED_REGION_SIZE=0x400000
 # CONFIG_NHLT_MAX98373 is not set
 CONFIG_MAX_ROOT_PORTS=24
 CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000
-CONFIG_FSP_HYPERTHREADING=y
 CONFIG_UART_PCI_ADDR=0x0
 CONFIG_SOC_INTEL_COMMON_SKYLAKE_BASE=y
 CONFIG_SOC_INTEL_KABYLAKE=y
+CONFIG_FSP_HYPERTHREADING=y
 CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
-CONFIG_MAINBOARD_USES_FSP2_0=y
-CONFIG_USE_FSP2_0_DRIVER=y
 # CONFIG_EXCLUDE_NATIVE_SD_INTERFACE is not set
 # CONFIG_SKYLAKE_SOC_PCH_H is not set
 # CONFIG_NHLT_DMIC_2CH is not set
@@ -249,6 +253,8 @@ CONFIG_USE_FSP2_0_DRIVER=y
 # CONFIG_NHLT_RT5663 is not set
 # CONFIG_NHLT_MAX98927 is not set
 # CONFIG_NO_FADT_8042 is not set
+CONFIG_MAINBOARD_SUPPORTS_KABYLAKE_DUAL=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_P2SB=y
 CONFIG_SOC_INTEL_COMMON=y
 
 #
@@ -265,7 +271,6 @@ CONFIG_INTEL_CAR_NEM_ENHANCED=y
 # CONFIG_USE_INTEL_FSP_MP_INIT is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_CSE=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_DSP=y
-CONFIG_SOC_INTEL_COMMON_BLOCK_EBDA=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_FAST_SPI=y
 CONFIG_FAST_SPI_DISABLE_WRITE_STATUS=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO=y
@@ -276,7 +281,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_LEGACY_MACROS=y
 # CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_MULTI_ACPI_DEVICES is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_DUAL_ROUTE_SUPPORT=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_GRAPHICS=y
-# CONFIG_SKIP_GRAPHICS_ENABLING is not set
+CONFIG_SOC_INTEL_CONFIGURE_DDI_A_4_LANES=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI=y
 # CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_VERSION_2 is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_HDA=y
@@ -286,36 +291,45 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_I2C=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_ITSS=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_LPC=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_LPSS=y
-CONFIG_SOC_INTEL_COMMON_BLOCK_P2SB=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_PCIE=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_PCR=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_PMC=y
 # CONFIG_PMC_INVALID_READ_AFTER_WRITE is not set
 CONFIG_PMC_GLOBAL_RESET_ENABLE_LOCK=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_POWER_LIMIT=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_RTC=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SATA=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SCS=y
 # CONFIG_SOC_INTEL_COMMON_EARLY_MMC_WAKE is not set
 # CONFIG_SOC_INTEL_COMMON_MMC_OVERRIDE is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_SGX=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_LOCK_MEMORY=y
+# CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_MAX is not set
+# CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_256MB is not set
+# CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_128MB is not set
+# CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_64MB is not set
+# CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_32MB is not set
+# CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_SIZE_1MB is not set
+CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_PRMRR_DISABLED=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SMBUS=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_TCO=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_TCO_ENABLE_THROUGH_SMBUS=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SMM=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP=y
 # CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_ESPI_DISABLE is not set
+# CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_TCO_ENABLE is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
 # CONFIG_HECI_DISABLE_USING_SMM is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_SPI=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SA=y
-CONFIG_SA_PCIEX_LENGTH=0x4000000
-CONFIG_PCIEX_LENGTH_64MB=y
+CONFIG_SA_PCIEX_LENGTH=0x10000000
 # CONFIG_SA_ENABLE_IMR is not set
 CONFIG_SA_ENABLE_DPR=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_THERMAL=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_TIMER=y
 CONFIG_USE_LEGACY_8254_TIMER=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_UART=y
+CONFIG_INTEL_LPSS_UART_FOR_CONSOLE=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_XDCI=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG=y
@@ -345,6 +359,7 @@ CONFIG_SOC_INTEL_COMMON_NHLT=y
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_SOC_QUALCOMM_QCS405 is not set
+# CONFIG_SOC_QUALCOMM_SC7180 is not set
 # CONFIG_SOC_QUALCOMM_SDM845 is not set
 # CONFIG_SOC_ROCKCHIP_RK3288 is not set
 # CONFIG_SOC_ROCKCHIP_RK3399 is not set
@@ -355,7 +370,6 @@ CONFIG_SOC_INTEL_COMMON_NHLT=y
 #
 # CPU
 #
-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
@@ -365,6 +379,8 @@ CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE=y
 CONFIG_CPU_INTEL_COMMON=y
 CONFIG_ENABLE_VMX=y
 CONFIG_SET_IA32_FC_LOCK_BIT=y
+CONFIG_CPU_INTEL_COMMON_HYPERTHREADING=y
+CONFIG_CPU_INTEL_COMMON_SMM=y
 CONFIG_MICROCODE_UPDATE_PRE_RAM=y
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
@@ -372,7 +388,6 @@ CONFIG_PARALLEL_MP=y
 CONFIG_PARALLEL_MP_AP_WORK=y
 # CONFIG_UDELAY_LAPIC is not set
 CONFIG_UDELAY_TSC=y
-CONFIG_TSC_CONSTANT_RATE=y
 CONFIG_TSC_MONOTONIC_TIMER=y
 # CONFIG_TSC_SYNC_LFENCE is not set
 CONFIG_TSC_SYNC_MFENCE=y
@@ -388,9 +403,7 @@ CONFIG_SMM_STUB_STACK_SIZE=0x400
 # CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
 # CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 CONFIG_SSE=y
 CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
@@ -406,21 +419,28 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
+CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
+CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
 
 #
 # Southbridge
 #
 # CONFIG_AMD_SB_CIMX is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE is not set
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9 is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
 # CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG is not set
 CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
 CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
@@ -430,12 +450,15 @@ CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #
 # CONFIG_SUPERIO_ASPEED_AST2400 is not set
 # CONFIG_SUPERIO_ASPEED_COMMON_PRE_RAM is not set
+# CONFIG_SUPERIO_ASPEED_HAS_UART_DELAY_WORKAROUND is not set
 # CONFIG_SUPERIO_FINTEK_FAN_CONTROL is not set
 
 #
 # Embedded Controllers
 #
 CONFIG_EC_ACPI=y
+# CONFIG_EC_51NB_NPCE985LA0DX is not set
+# CONFIG_EC_GOOGLE_CHROMEEC_SKUID is not set
 # CONFIG_EC_GOOGLE_WILCO is not set
 
 #
@@ -471,21 +494,16 @@ 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_RAMBASE=0xe00000
 CONFIG_RAMTOP=0x1000000
+CONFIG_NUM_IPI_STARTS=2
 # CONFIG_CBMEM_TOP_BACKUP is not set
-CONFIG_EARLY_EBDA_INIT=y
 CONFIG_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
-# CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
 CONFIG_HAVE_CMOS_DEFAULT=y
 CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
@@ -496,7 +514,8 @@ CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POSTCAR_STAGE=y
 # CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
 # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
-CONFIG_ACPI_HAVE_PCAT_8259=y
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
 # CONFIG_COLLECT_TIMESTAMPS_NO_TSC is not set
 CONFIG_COLLECT_TIMESTAMPS_TSC=y
 # CONFIG_PAGING_IN_CACHE_AS_RAM is not set
@@ -522,20 +541,27 @@ CONFIG_RUN_FSP_GOP=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 # CONFIG_BOOTSPLASH is not set
-# 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_HT_CHAIN_UNITID_BASE=0
+CONFIG_HT_CHAIN_END_UNITID_BASE=0
 CONFIG_PCIX_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_PCIEXP_HOTPLUG=y
+CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_ABOVE_4G=y
+# CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G is not set
+CONFIG_PCIEXP_HOTPLUG_IO=0x2000
 # CONFIG_EARLY_PCI_BRIDGE is not set
+# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
 CONFIG_INTEL_GMA_HAVE_VBT=y
 CONFIG_INTEL_GMA_ADD_VBT=y
 # CONFIG_SOFTWARE_I2C is not set
+# CONFIG_RESOURCE_ALLOCATOR_V3 is not set
+CONFIG_RESOURCE_ALLOCATOR_V4=y
 
 #
 # Generic Drivers
@@ -550,10 +576,10 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
 CONFIG_CACHE_MRC_SETTINGS=y
 CONFIG_MRC_SETTINGS_PROTECT=y
 # CONFIG_HAS_RECOVERY_MRC_CACHE is not set
-# CONFIG_MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN is not set
 # CONFIG_MRC_SETTINGS_VARIABLE_DATA is not set
 # CONFIG_MRC_WRITE_NV_LATE is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
+# CONFIG_RT8168_SUPPORT_LEGACY_VPD_MAC is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 CONFIG_SMMSTORE=y
 # CONFIG_SMMSTORE_IN_CBFS is not set
@@ -561,20 +587,21 @@ CONFIG_SMMSTORE_REGION="SMMSTORE"
 CONFIG_SMMSTORE_FILENAME="smm_store"
 CONFIG_SMMSTORE_SIZE=0x40000
 CONFIG_SPI_FLASH=y
+# CONFIG_SPI_SDCARD is not set
 CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
 CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
+CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_SMM=y
 # CONFIG_SPI_FLASH_NO_FAST_READ is not set
-# 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=y
 CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
-# CONFIG_DRIVERS_UART_8250MEM is not set
-# CONFIG_DRIVERS_UART_8250MEM_32 is not set
+CONFIG_DRIVERS_UART_8250MEM=y
+CONFIG_DRIVERS_UART_8250MEM_32=y
 # CONFIG_HAVE_UART_SPECIAL is not set
-# CONFIG_DRIVERS_UART_OXPCIE is not set
 # CONFIG_DRIVERS_UART_PL011 is not set
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 # CONFIG_HAVE_USBDEBUG is not set
@@ -583,12 +610,17 @@ CONFIG_NO_UART_ON_SUPERIO=y
 CONFIG_DRIVERS_GENERIC_WIFI=y
 # CONFIG_USE_SAR is not set
 # CONFIG_DRIVERS_AMD_PI is not set
+# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
+# CONFIG_DRIVERS_GFX_GENERIC is not set
 CONFIG_DRIVERS_I2C_DESIGNWARE=y
 # CONFIG_DRIVERS_I2C_DESIGNWARE_DEBUG is not set
 # CONFIG_DRIVERS_I2C_MAX98373 is not set
+# CONFIG_DRIVERS_I2C_MAX98390 is not set
 # CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCA9538 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_PTN3460 is not set
+# CONFIG_DRIVERS_I2C_RT1011 is not set
 # CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 # CONFIG_DRIVERS_I2C_RX6110SA is not set
@@ -596,34 +628,35 @@ CONFIG_DRIVERS_I2C_DESIGNWARE=y
 # 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_FSP1_0 is not set
 CONFIG_FSP_USE_REPO=y
 # CONFIG_DISPLAY_HOBS is not set
 # CONFIG_DISPLAY_UPD_DATA is not set
 CONFIG_PLATFORM_USES_FSP2_0=y
 # CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_DISPLAY_FSP_CALLS_AND_STATUS is not set
-# CONFIG_DISPLAY_FSP_HEADER is not set
+CONFIG_HAVE_INTEL_FSP_REPO=y
 # CONFIG_FSP_CAR is not set
 # CONFIG_FSP_T_XIP is not set
 # CONFIG_FSP_USES_CB_STACK is not set
-# CONFIG_VERIFY_HOBS is not set
-# CONFIG_DISPLAY_FSP_VERSION_INFO is not set
+CONFIG_HAVE_FSP_LOGO_SUPPORT=y
+# CONFIG_FSP2_0_DISPLAY_LOGO is not set
 # CONFIG_INTEL_DDI is not set
 # CONFIG_INTEL_EDID is not set
 # CONFIG_INTEL_INT15 is not set
 CONFIG_INTEL_GMA_ACPI=y
+CONFIG_INTEL_GMA_BCLV_WIDTH=16
+CONFIG_INTEL_GMA_BCLM_WIDTH=16
 # CONFIG_INTEL_GMA_SSC_ALTERNATE_REF is not set
 # CONFIG_INTEL_GMA_SWSMISCI is not set
 # CONFIG_DRIVER_INTEL_I210 is not set
+# CONFIG_DRIVERS_INTEL_ISH is not set
 # CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_PMC is not set
 # CONFIG_HAVE_INTEL_PTT is not set
 # CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
-# CONFIG_UDELAY_IO is not set
-# CONFIG_UDELAY_TIMER2 is not set
+# CONFIG_DRIVERS_PS2_KEYBOARD is not set
 CONFIG_DRIVERS_MC146818=y
 CONFIG_LPC_TPM=y
 CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
@@ -633,8 +666,8 @@ CONFIG_MAINBOARD_HAS_LPC_TPM=y
 # CONFIG_NC_FPGA_NOTIFY_CB_READY is not set
 # CONFIG_DRIVERS_SIL_3114 is not set
 # CONFIG_MAINBOARD_HAS_SPI_TPM_CR50 is not set
+# CONFIG_MAINBOARD_HAS_SPI_TPM is not set
 # 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_COMMONLIB_STORAGE is not set
@@ -654,20 +687,22 @@ CONFIG_TPM2=y
 CONFIG_MAINBOARD_HAS_TPM2=y
 CONFIG_DEBUG_TPM=y
 # CONFIG_TPM_RDRESP_NEED_DELAY is not set
+# CONFIG_TPM_MEASURED_BOOT is not set
 
 #
 # Memory initialization
 #
 CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
 # CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT is not set
-
-#
-# Intel
-#
 # CONFIG_INTEL_TXT is not set
-# CONFIG_ACPI_SATA_GENERATOR is not set
-CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
+# CONFIG_STM is not set
+CONFIG_BOOTMEDIA_LOCK_NONE=y
+# CONFIG_BOOTMEDIA_LOCK_CONTROLLER is not set
+# CONFIG_BOOTMEDIA_LOCK_CHIP is not set
 # CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
+CONFIG_ACPI_HAVE_PCAT_8259=y
+CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
+CONFIG_HAVE_ACPI_TABLES=y
 # CONFIG_BOOT_DEVICE_NOT_SPI_FLASH is not set
 CONFIG_BOOT_DEVICE_SPI_FLASH=y
 CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
@@ -680,6 +715,7 @@ CONFIG_RTC=y
 CONFIG_BOOTBLOCK_CONSOLE=y
 CONFIG_POSTCAR_CONSOLE=y
 CONFIG_SQUELCH_EARLY_SMP=y
+CONFIG_FIXED_UART_FOR_CONSOLE=y
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
@@ -695,15 +731,14 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_2 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
-# CONFIG_NO_POST is not set
+CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7
 # CONFIG_CMOS_POST is not set
+# CONFIG_DEFAULT_POST_ON_LPC is not set
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
 CONFIG_HWBASE_DEBUG_CB=y
 CONFIG_HAVE_ACPI_RESUME=y
+# CONFIG_DISABLE_ACPI_HIBERNATE is not set
 CONFIG_RESUME_PATH_SAME_AS_BOOT=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
 # CONFIG_NO_MONOTONIC_TIMER is not set
 CONFIG_HAVE_MONOTONIC_TIMER=y
 # CONFIG_TIMER_QUEUE is not set
@@ -712,7 +747,6 @@ CONFIG_HAVE_OPTION_TABLE=y
 CONFIG_IOAPIC=y
 # CONFIG_USE_WATCHDOG_ON_BOOT is not set
 # CONFIG_GFXUMA is not set
-CONFIG_HAVE_ACPI_TABLES=y
 CONFIG_COMMON_FADT=y
 CONFIG_ACPI_NHLT=y
 
@@ -723,13 +757,13 @@ CONFIG_ACPI_NHLT=y
 # CONFIG_GENERATE_PIRQ_TABLE is not set
 CONFIG_GENERATE_SMBIOS_TABLES=y
 # CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
+CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
 
 #
 # Payload
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=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
@@ -741,12 +775,7 @@ CONFIG_PAYLOAD_ELF=y
 CONFIG_PAYLOAD_FILE="$(FIRMWARE_OPEN_UEFIPAYLOAD)"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
-# CONFIG_TIANOCORE_COREBOOTPAYLOAD is not set
-# CONFIG_TIANOCORE_UEFIPAYLOAD is not set
-# CONFIG_TIANOCORE_TARGET_IA32 is not set
-# CONFIG_TIANOCORE_TARGET_X64 is not set
-# CONFIG_TIANOCORE_DEBUG is not set
-# CONFIG_TIANOCORE_RELEASE is not set
+# CONFIG_COMPRESSED_PAYLOAD_NONE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_COMPRESSED_PAYLOAD_LZ4 is not set
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
@@ -770,18 +799,27 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
 CONFIG_HAVE_DISPLAY_MTRRS=y
 # CONFIG_DISPLAY_MTRRS is not set
 
+#
+# BLOB Debug Settings
+#
+# CONFIG_DISPLAY_FSP_CALLS_AND_STATUS is not set
+# CONFIG_DISPLAY_FSP_HEADER is not set
+# CONFIG_VERIFY_HOBS is not set
+# CONFIG_DISPLAY_FSP_VERSION_INFO is not set
+
 #
 # General Debug Settings
 #
+# CONFIG_GDB_STUB is not set
 # CONFIG_FATAL_ASSERTS is not set
 CONFIG_HAVE_DEBUG_GPIO=y
 # CONFIG_DEBUG_GPIO is not set
 # CONFIG_DEBUG_CBFS is not set
 # CONFIG_HAVE_DEBUG_RAM_SETUP is not set
-# CONFIG_HAVE_DEBUG_SMBUS is not set
+CONFIG_HAVE_DEBUG_SMBUS=y
+# CONFIG_DEBUG_SMBUS is not set
 # CONFIG_DEBUG_SMI is not set
 # CONFIG_DEBUG_MALLOC is not set
-# CONFIG_DEBUG_ACPI is not set
 # CONFIG_DEBUG_CONSOLE_INIT is not set
 # CONFIG_DEBUG_SPI_FLASH is not set
 # CONFIG_TRACE is not set
@@ -791,7 +829,6 @@ CONFIG_HAVE_EM100_SUPPORT=y
 # CONFIG_EM100 is not set
 CONFIG_NO_EDID_FILL_FB=y
 CONFIG_SPD_READ_BY_WORD=y
-# CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
@@ -799,11 +836,11 @@ CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
 # CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
 CONFIG_REG_SCRIPT=y
+CONFIG_MAX_REBOOT_CNT=3
 # CONFIG_NO_XIP_EARLY_STAGES is not set
 # CONFIG_EARLY_CBMEM_LIST is not set
 CONFIG_RELOCATABLE_MODULES=y
 CONFIG_GENERIC_GPIO_LIB=y
-CONFIG_C_ENVIRONMENT_BOOTBLOCK=y
+CONFIG_HAVE_BOOTBLOCK=y
 CONFIG_HAVE_ROMSTAGE=y
-CONFIG_HAVE_POSTCAR=y
 CONFIG_HAVE_RAMSTAGE=y
diff --git a/models/galp4/coreboot.config b/models/galp4/coreboot.config
index 80eb177..c415fd1 100644
--- a/models/galp4/coreboot.config
+++ b/models/galp4/coreboot.config
@@ -242,8 +242,8 @@ CONFIG_SOC_INTEL_COMETLAKE=y
 CONFIG_MAX_ROOT_PORTS=16
 CONFIG_MAX_PCIE_CLOCKS=6
 # CONFIG_MB_HAS_ACTIVE_HIGH_SD_PWR_ENABLE is not set
-# CONFIG_USE_CANNONLAKE_CAR_NEM_ENHANCED is not set
-CONFIG_USE_CANNONLAKE_FSP_CAR=y
+CONFIG_USE_CANNONLAKE_CAR_NEM_ENHANCED=y
+# CONFIG_USE_CANNONLAKE_FSP_CAR is not set
 CONFIG_SOC_INTEL_CANNONLAKE_DEBUG_CONSENT=0
 CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000
 CONFIG_UART_PCI_ADDR=0x0
@@ -259,10 +259,10 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_ACPI=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_CHIP_CONFIG=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_CPU=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_CPU_MPINIT=y
-# CONFIG_SOC_INTEL_COMMON_BLOCK_CAR is not set
+CONFIG_SOC_INTEL_COMMON_BLOCK_CAR=y
 # CONFIG_INTEL_CAR_NEM is not set
 # CONFIG_INTEL_CAR_CQOS is not set
-# CONFIG_INTEL_CAR_NEM_ENHANCED is not set
+CONFIG_INTEL_CAR_NEM_ENHANCED=y
 # CONFIG_USE_INTEL_FSP_MP_INIT is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_CSE=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_DSP=y
@@ -384,8 +384,7 @@ CONFIG_UDELAY_TSC=y
 CONFIG_TSC_MONOTONIC_TIMER=y
 # CONFIG_TSC_SYNC_LFENCE is not set
 # CONFIG_TSC_SYNC_MFENCE is not set
-# CONFIG_NO_FIXED_XIP_ROM_SIZE is not set
-CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_NO_FIXED_XIP_ROM_SIZE=y
 CONFIG_LOGICAL_CPUS=y
 CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_NO_SMM is not set
@@ -625,10 +624,8 @@ CONFIG_FSP_USE_REPO=y
 CONFIG_PLATFORM_USES_FSP2_0=y
 # CONFIG_PLATFORM_USES_FSP2_1 is not set
 CONFIG_HAVE_INTEL_FSP_REPO=y
-CONFIG_FSP_T_CBFS="fspt.bin"
-CONFIG_FSP_T_FILE="$(obj)/Fsp_T.fd"
-CONFIG_FSP_CAR=y
-CONFIG_FSP_T_XIP=y
+# CONFIG_FSP_CAR is not set
+# CONFIG_FSP_T_XIP is not set
 CONFIG_FSP_USES_CB_STACK=y
 CONFIG_HAVE_FSP_LOGO_SUPPORT=y
 # CONFIG_FSP2_0_DISPLAY_LOGO is not set
diff --git a/models/lemp9/coreboot.config b/models/lemp9/coreboot.config
index ba21cda..df14e41 100644
--- a/models/lemp9/coreboot.config
+++ b/models/lemp9/coreboot.config
@@ -47,6 +47,7 @@ CONFIG_TSEG_STAGE_CACHE=y
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_CAVIUM is not set
 # CONFIG_VENDOR_COMPULAB is not set
+# CONFIG_VENDOR_DELL is not set
 # CONFIG_VENDOR_ELMEX is not set
 # CONFIG_VENDOR_EMULATION is not set
 # CONFIG_VENDOR_FACEBOOK is not set
@@ -192,6 +193,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 #
 CONFIG_CPU_SPECIFIC_OPTIONS=y
 CONFIG_CPU_ADDR_BITS=36
+CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_CONSOLE_UART_BASE_ADDRESS=0xfe032000
 CONFIG_SMM_TSEG_SIZE=0x800000
 CONFIG_SMM_RESERVED_SIZE=0x200000
@@ -209,7 +211,6 @@ CONFIG_PCR_BASE_ADDRESS=0xfd000000
 CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_CLOCK_MHZ=120
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
-CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_FSP_HEADER_PATH="3rdparty/fsp/CometLakeFspBinPkg/CometLake1/Include/"
 CONFIG_FSP_FD_PATH="3rdparty/fsp/CometLakeFspBinPkg/CometLake1/FSP.fd"
 # CONFIG_NHLT_DMIC_1CH_16B is not set
@@ -234,8 +235,8 @@ CONFIG_SOC_INTEL_COMETLAKE=y
 CONFIG_MAX_ROOT_PORTS=16
 CONFIG_MAX_PCIE_CLOCKS=6
 # CONFIG_MB_HAS_ACTIVE_HIGH_SD_PWR_ENABLE is not set
-# CONFIG_USE_CANNONLAKE_CAR_NEM_ENHANCED is not set
-CONFIG_USE_CANNONLAKE_FSP_CAR=y
+CONFIG_USE_CANNONLAKE_CAR_NEM_ENHANCED=y
+# CONFIG_USE_CANNONLAKE_FSP_CAR is not set
 CONFIG_SOC_INTEL_CANNONLAKE_DEBUG_CONSENT=0
 CONFIG_INTEL_TXT_BIOSACM_ALIGNMENT=0x40000
 CONFIG_UART_PCI_ADDR=0x0
@@ -251,10 +252,10 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_ACPI=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_CHIP_CONFIG=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_CPU=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_CPU_MPINIT=y
-# CONFIG_SOC_INTEL_COMMON_BLOCK_CAR is not set
+CONFIG_SOC_INTEL_COMMON_BLOCK_CAR=y
 # CONFIG_INTEL_CAR_NEM is not set
 # CONFIG_INTEL_CAR_CQOS is not set
-# CONFIG_INTEL_CAR_NEM_ENHANCED is not set
+CONFIG_INTEL_CAR_NEM_ENHANCED=y
 # CONFIG_USE_INTEL_FSP_MP_INIT is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_CSE=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_DSP=y
@@ -268,6 +269,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_ITSS_POL_CFG=y
 # CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_MULTI_ACPI_DEVICES is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_DUAL_ROUTE_SUPPORT=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_GRAPHICS=y
+CONFIG_SOC_INTEL_CONFIGURE_DDI_A_4_LANES=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_VERSION_2=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_HDA=y
@@ -282,6 +284,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_PCR=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_PMC=y
 # CONFIG_PMC_INVALID_READ_AFTER_WRITE is not set
 CONFIG_PMC_GLOBAL_RESET_ENABLE_LOCK=y
+CONFIG_SOC_INTEL_COMMON_BLOCK_POWER_LIMIT=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_RTC=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SATA=y
 CONFIG_SOC_AHCI_PORT_IMPLEMENTED_INVERT=y
@@ -374,8 +377,7 @@ CONFIG_UDELAY_TSC=y
 CONFIG_TSC_MONOTONIC_TIMER=y
 # CONFIG_TSC_SYNC_LFENCE is not set
 # CONFIG_TSC_SYNC_MFENCE is not set
-# CONFIG_NO_FIXED_XIP_ROM_SIZE is not set
-CONFIG_XIP_ROM_SIZE=0x10000
+CONFIG_NO_FIXED_XIP_ROM_SIZE=y
 CONFIG_LOGICAL_CPUS=y
 CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_NO_SMM is not set
@@ -534,6 +536,8 @@ CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_INTEL_GMA_HAVE_VBT=y
 CONFIG_INTEL_GMA_ADD_VBT=y
 # CONFIG_SOFTWARE_I2C is not set
+# CONFIG_RESOURCE_ALLOCATOR_V3 is not set
+CONFIG_RESOURCE_ALLOCATOR_V4=y
 
 #
 # Generic Drivers
@@ -589,6 +593,7 @@ CONFIG_DRIVERS_I2C_DESIGNWARE=y
 CONFIG_DRIVERS_I2C_GENERIC=y
 CONFIG_DRIVERS_I2C_HID=y
 # CONFIG_DRIVERS_I2C_MAX98373 is not set
+# CONFIG_DRIVERS_I2C_MAX98390 is not set
 # CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCA9538 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
@@ -607,10 +612,8 @@ CONFIG_FSP_USE_REPO=y
 CONFIG_PLATFORM_USES_FSP2_0=y
 # CONFIG_PLATFORM_USES_FSP2_1 is not set
 CONFIG_HAVE_INTEL_FSP_REPO=y
-CONFIG_FSP_T_CBFS="fspt.bin"
-CONFIG_FSP_T_FILE="$(obj)/Fsp_T.fd"
-CONFIG_FSP_CAR=y
-CONFIG_FSP_T_XIP=y
+# CONFIG_FSP_CAR is not set
+# CONFIG_FSP_T_XIP is not set
 CONFIG_FSP_USES_CB_STACK=y
 CONFIG_HAVE_FSP_LOGO_SUPPORT=y
 # CONFIG_FSP2_0_DISPLAY_LOGO is not set
@@ -625,6 +628,7 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
 # CONFIG_DRIVER_INTEL_I210 is not set
 # CONFIG_DRIVERS_INTEL_ISH is not set
 # CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
+# CONFIG_DRIVERS_INTEL_PMC is not set
 # CONFIG_HAVE_INTEL_PTT is not set
 # CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set