Update galp2 and galp3 config

models/galp2/coreboot.config

@@ -84,6 +84,7 @@ CONFIG_CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM=y
 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"
@@ -108,12 +109,16 @@ 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_DCACHE_BSP_STACK_SIZE=0x4000
 CONFIG_MMCONF_BASE_ADDRESS=0xe0000000
 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_UART_8250IO is not set
 # CONFIG_VBOOT is not set
 CONFIG_DIMM_MAX=2
@@ -150,6 +155,8 @@ CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x1303
 CONFIG_CONSOLE_POST=y
 CONFIG_PXE_ROM_ID="10ec,8168"
 CONFIG_FSP_M_XIP=y
+CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
+CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
@@ -158,6 +165,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_6144 is not set
 CONFIG_COREBOOT_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
@@ -189,7 +197,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 CONFIG_CPU_SPECIFIC_OPTIONS=y
 CONFIG_SMM_TSEG_SIZE=0x800000
 CONFIG_SMM_RESERVED_SIZE=0x200000
-CONFIG_SMM_MODULE_STACK_SIZE=0x400
+CONFIG_SMM_MODULE_STACK_SIZE=0x800
 CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 CONFIG_DRIVERS_I2C_DESIGNWARE_CLOCK_MHZ=120
 # CONFIG_SOC_CAVIUM_CN81XX is not set
@@ -206,7 +214,6 @@ CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
 CONFIG_FSP_FD_PATH="3rdparty/fsp/KabylakeFspBinPkg/Fsp.fd"
 # CONFIG_NHLT_MAX98357 is not set
 # CONFIG_NHLT_DA7219 is not set
-# CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS is not set
 CONFIG_IFD_CHIPSET="sklkbl"
 CONFIG_CPU_BCLK_MHZ=100
 CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x30
@@ -218,16 +225,11 @@ CONFIG_IED_REGION_SIZE=0x400000
 CONFIG_PCIEXP_ASPM=y
 CONFIG_PCIEXP_COMMON_CLOCK=y
 CONFIG_PCIEXP_CLK_PM=y
-# CONFIG_SOC_INTEL_COMMON_CANNONLAKE_BASE is not set
-# CONFIG_SOC_INTEL_COFFEELAKE is not set
-# CONFIG_SOC_INTEL_WHISKEYLAKE is not set
-# CONFIG_SOC_INTEL_COMETLAKE is not set
-# CONFIG_SOC_INTEL_CANNONLAKE_PCH_H is not set
 # CONFIG_NHLT_MAX98373 is not set
 CONFIG_MAX_ROOT_PORTS=24
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_UART_PCI_ADDR=0x0
-CONFIG_SOC_INTEL_SKYLAKE=y
+CONFIG_SOC_INTEL_COMMON_SKYLAKE_BASE=y
 CONFIG_SOC_INTEL_KABYLAKE=y
 CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
 CONFIG_MAINBOARD_USES_FSP2_0=y
@@ -255,11 +257,6 @@ 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=y
-
-#
-# Multiple Processor (MP) Initialization Options
-#
-CONFIG_USE_COREBOOT_NATIVE_MP_INIT=y
 # CONFIG_USE_INTEL_FSP_MP_INIT is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_CSE=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_DSP=y
@@ -274,6 +271,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_COMMON_BLOCK_GSPI=y
 # CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_VERSION_2 is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_HDA=y
@@ -291,6 +289,7 @@ CONFIG_PMC_GLOBAL_RESET_ENABLE_LOCK=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_BLOCK_SGX=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SMBUS=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_TCO=y
@@ -299,6 +298,7 @@ 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_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
@@ -306,6 +306,7 @@ CONFIG_PCIEX_LENGTH_64MB=y
 # CONFIG_SA_ENABLE_IMR is not set
 CONFIG_SA_ENABLE_DPR=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_TIMER=y
+# CONFIG_USE_LEGACY_8254_TIMER is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_UART=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_XDCI=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y
@@ -333,7 +334,7 @@ CONFIG_SOC_INTEL_COMMON_NHLT=y
 # CONFIG_SOC_MEDIATEK_MT8183 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
-# CONFIG_QC_SDI_ENABLE is not set
+# CONFIG_SOC_QUALCOMM_COMMON is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_SOC_QUALCOMM_QCS405 is not set
@@ -363,23 +364,23 @@ CONFIG_MICROCODE_UPDATE_PRE_RAM=y
 # CONFIG_PARALLEL_CPU_INIT is not set
 CONFIG_PARALLEL_MP=y
 CONFIG_PARALLEL_MP_AP_WORK=y
-# CONFIG_UDELAY_IO is not set
 # CONFIG_UDELAY_LAPIC is not set
 CONFIG_UDELAY_TSC=y
 CONFIG_TSC_CONSTANT_RATE=y
 CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_UDELAY_TIMER2 is not set
 # CONFIG_TSC_SYNC_LFENCE is not set
 CONFIG_TSC_SYNC_MFENCE=y
 CONFIG_NO_FIXED_XIP_ROM_SIZE=y
 CONFIG_LOGICAL_CPUS=y
+CONFIG_HAVE_SMI_HANDLER=y
+# CONFIG_NO_SMM is not set
+# CONFIG_SMM_ASEG is not set
 CONFIG_SMM_TSEG=y
 CONFIG_SMM_MODULE_HEAP_SIZE=0x4000
 CONFIG_SMM_STUB_STACK_SIZE=0x400
 # CONFIG_SMM_LAPIC_REMAP_MITIGATION is not set
 # CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
 # CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
@@ -399,7 +400,6 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_MAX_PIRQ_LINKS=4
 
 #
 # Southbridge
@@ -421,7 +421,8 @@ CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
 #
 # Super I/O
 #
-# CONFIG_SUPERIO_NUVOTON_NCT6776_COM_A is not set
+# CONFIG_SUPERIO_ASPEED_AST2400 is not set
+# CONFIG_SUPERIO_ASPEED_COMMON_PRE_RAM is not set
 
 #
 # Embedded Controllers
@@ -439,7 +440,11 @@ CONFIG_EC_BASE_PACKET=0x950
 #
 CONFIG_HAVE_ME_BIN=y
 # CONFIG_CHECK_ME is not set
-# CONFIG_USE_ME_CLEANER is not set
+CONFIG_USE_ME_CLEANER=y
+
+#
+# Please test the modified ME/TXE firmware and coreboot in two steps
+#
 # CONFIG_MAINBOARD_USES_IFD_GBE_REGION is not set
 # CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
 # CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
@@ -487,28 +492,11 @@ CONFIG_UDK_VERSION=2015
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
 # CONFIG_ARM64_USE_ARCH_TIMER is not set
 # CONFIG_ARM64_A53_ERRATUM_843419 is not set
-# CONFIG_ARCH_MIPS is not set
-# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
-# CONFIG_ARCH_VERSTAGE_MIPS is not set
-# CONFIG_ARCH_ROMSTAGE_MIPS is not set
-# CONFIG_ARCH_RAMSTAGE_MIPS is not set
 # CONFIG_ARCH_PPC64 is not set
 # CONFIG_ARCH_BOOTBLOCK_PPC64 is not set
 # CONFIG_ARCH_VERSTAGE_PPC64 is not set
 # CONFIG_ARCH_ROMSTAGE_PPC64 is not set
 # CONFIG_ARCH_RAMSTAGE_PPC64 is not set
-# CONFIG_ARCH_RISCV is not set
-CONFIG_ARCH_RISCV_M=y
-# CONFIG_ARCH_RISCV_S is not set
-# CONFIG_ARCH_RISCV_U is not set
-# CONFIG_ARCH_RISCV_RV64 is not set
-# CONFIG_ARCH_RISCV_RV32 is not set
-# CONFIG_ARCH_RISCV_PMP is not set
-# CONFIG_ARCH_BOOTBLOCK_RISCV is not set
-# CONFIG_ARCH_VERSTAGE_RISCV is not set
-# CONFIG_ARCH_ROMSTAGE_RISCV is not set
-# CONFIG_ARCH_RAMSTAGE_RISCV is not set
-# CONFIG_RISCV_USE_ARCH_TIMER is not set
 CONFIG_ARCH_X86=y
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -540,15 +528,13 @@ CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POSTCAR_STAGE=y
 # CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
 # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
-CONFIG_BOOTBLOCK_SIMPLE=y
-# CONFIG_BOOTBLOCK_NORMAL is not set
-CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 CONFIG_ACPI_HAVE_PCAT_8259=y
 # CONFIG_COLLECT_TIMESTAMPS_NO_TSC is not set
 CONFIG_COLLECT_TIMESTAMPS_TSC=y
 # CONFIG_PAGING_IN_CACHE_AS_RAM is not set
 # CONFIG_IDT_IN_EVERY_STAGE is not set
 CONFIG_HAVE_CF9_RESET=y
+# CONFIG_PIRQ_ROUTE is not set
 
 #
 # Devices
@@ -577,8 +563,6 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # CONFIG_EARLY_PCI_BRIDGE is not set
-CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
-CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 CONFIG_INTEL_GMA_HAVE_VBT=y
 CONFIG_INTEL_GMA_ADD_VBT=y
 # CONFIG_SOFTWARE_I2C is not set
@@ -592,7 +576,6 @@ CONFIG_INTEL_GMA_ADD_VBT=y
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
 CONFIG_CACHE_MRC_SETTINGS=y
-CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_MRC_SETTINGS_PROTECT=y
 # CONFIG_HAS_RECOVERY_MRC_CACHE is not set
 # CONFIG_MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN is not set
@@ -613,7 +596,6 @@ CONFIG_SPI_FLASH_SMM=y
 # CONFIG_SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B is not set
 # CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
-CONFIG_TPM_INIT=y
 CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
@@ -626,6 +608,8 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_HAVE_USBDEBUG is not set
 # CONFIG_HAVE_USBDEBUG_OPTIONS is not set
 # CONFIG_VPD is not set
+CONFIG_DRIVERS_GENERIC_WIFI=y
+# CONFIG_USE_SAR is not set
 # CONFIG_DRIVERS_AMD_PI is not set
 # CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
 CONFIG_DRIVERS_I2C_DESIGNWARE=y
@@ -641,6 +625,7 @@ 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
@@ -662,11 +647,12 @@ CONFIG_INTEL_GMA_ACPI=y
 # CONFIG_DRIVER_INTEL_I210 is not set
 # CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
 CONFIG_DRIVERS_INTEL_WIFI=y
-# CONFIG_USE_SAR 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_MC146818=y
 CONFIG_LPC_TPM=y
 CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
@@ -698,6 +684,12 @@ CONFIG_TPM2=y
 CONFIG_MAINBOARD_HAS_TPM2=y
 # CONFIG_DEBUG_TPM is not set
 # CONFIG_TPM_RDRESP_NEED_DELAY is not set
+
+#
+# Memory initialization
+#
+CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
+# CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT is not set
 # CONFIG_ACPI_SATA_GENERATOR is not set
 CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
 # CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
@@ -737,12 +729,10 @@ 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_GENERIC_UDELAY is not set
 # CONFIG_TIMER_QUEUE is not set
 CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PIRQ_ROUTE is not set
-CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
 # CONFIG_USE_WATCHDOG_ON_BOOT is not set
@@ -805,7 +795,6 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
 #
 CONFIG_HAVE_DISPLAY_MTRRS=y
 # CONFIG_DISPLAY_MTRRS is not set
-# CONFIG_DEBUG_SMM_RELOCATION is not set
 
 #
 # General Debug Settings
@@ -827,6 +816,7 @@ CONFIG_HAVE_DEBUG_GPIO=y
 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
@@ -839,5 +829,4 @@ CONFIG_REG_SCRIPT=y
 # CONFIG_EARLY_CBMEM_LIST is not set
 CONFIG_RELOCATABLE_MODULES=y
 CONFIG_GENERIC_GPIO_LIB=y
-CONFIG_SPD_READ_BY_WORD=y
 CONFIG_C_ENVIRONMENT_BOOTBLOCK=y

models/galp3/coreboot.config

@@ -84,6 +84,7 @@ CONFIG_CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM=y
 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"
@@ -108,12 +109,16 @@ 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_DCACHE_BSP_STACK_SIZE=0x4000
 CONFIG_MMCONF_BASE_ADDRESS=0xe0000000
 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_UART_8250IO is not set
 # CONFIG_VBOOT is not set
 CONFIG_DIMM_MAX=2
@@ -149,6 +154,8 @@ CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x1313
 CONFIG_CONSOLE_POST=y
 CONFIG_PXE_ROM_ID="10ec,8168"
 CONFIG_FSP_M_XIP=y
+CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
+CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
@@ -157,6 +164,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_6144 is not set
 CONFIG_COREBOOT_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_12288 is not set
@@ -188,7 +196,7 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
 CONFIG_CPU_SPECIFIC_OPTIONS=y
 CONFIG_SMM_TSEG_SIZE=0x800000
 CONFIG_SMM_RESERVED_SIZE=0x200000
-CONFIG_SMM_MODULE_STACK_SIZE=0x400
+CONFIG_SMM_MODULE_STACK_SIZE=0x800
 CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 CONFIG_DRIVERS_I2C_DESIGNWARE_CLOCK_MHZ=120
 # CONFIG_SOC_CAVIUM_CN81XX is not set
@@ -205,7 +213,6 @@ CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
 CONFIG_FSP_FD_PATH="3rdparty/fsp/KabylakeFspBinPkg/Fsp.fd"
 # CONFIG_NHLT_MAX98357 is not set
 # CONFIG_NHLT_DA7219 is not set
-# CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS is not set
 CONFIG_IFD_CHIPSET="sklkbl"
 CONFIG_CPU_BCLK_MHZ=100
 CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x30
@@ -217,16 +224,11 @@ CONFIG_IED_REGION_SIZE=0x400000
 CONFIG_PCIEXP_ASPM=y
 CONFIG_PCIEXP_COMMON_CLOCK=y
 CONFIG_PCIEXP_CLK_PM=y
-# CONFIG_SOC_INTEL_COMMON_CANNONLAKE_BASE is not set
-# CONFIG_SOC_INTEL_COFFEELAKE is not set
-# CONFIG_SOC_INTEL_WHISKEYLAKE is not set
-# CONFIG_SOC_INTEL_COMETLAKE is not set
-# CONFIG_SOC_INTEL_CANNONLAKE_PCH_H is not set
 # CONFIG_NHLT_MAX98373 is not set
 CONFIG_MAX_ROOT_PORTS=24
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_UART_PCI_ADDR=0x0
-CONFIG_SOC_INTEL_SKYLAKE=y
+CONFIG_SOC_INTEL_COMMON_SKYLAKE_BASE=y
 CONFIG_SOC_INTEL_KABYLAKE=y
 CONFIG_CPU_INTEL_NUM_FIT_ENTRIES=10
 CONFIG_MAINBOARD_USES_FSP2_0=y
@@ -254,11 +256,6 @@ 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=y
-
-#
-# Multiple Processor (MP) Initialization Options
-#
-CONFIG_USE_COREBOOT_NATIVE_MP_INIT=y
 # CONFIG_USE_INTEL_FSP_MP_INIT is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_CSE=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_DSP=y
@@ -273,6 +270,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_COMMON_BLOCK_GSPI=y
 # CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_VERSION_2 is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_HDA=y
@@ -290,6 +288,7 @@ CONFIG_PMC_GLOBAL_RESET_ENABLE_LOCK=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_BLOCK_SGX=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SMBUS=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_TCO=y
@@ -298,6 +297,7 @@ 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_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
@@ -305,6 +305,7 @@ CONFIG_PCIEX_LENGTH_64MB=y
 # CONFIG_SA_ENABLE_IMR is not set
 CONFIG_SA_ENABLE_DPR=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_TIMER=y
+# CONFIG_USE_LEGACY_8254_TIMER is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_UART=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_XDCI=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y
@@ -332,7 +333,7 @@ CONFIG_SOC_INTEL_COMMON_NHLT=y
 # CONFIG_SOC_MEDIATEK_MT8183 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
-# CONFIG_QC_SDI_ENABLE is not set
+# CONFIG_SOC_QUALCOMM_COMMON is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_SOC_QUALCOMM_QCS405 is not set
@@ -362,23 +363,23 @@ CONFIG_MICROCODE_UPDATE_PRE_RAM=y
 # CONFIG_PARALLEL_CPU_INIT is not set
 CONFIG_PARALLEL_MP=y
 CONFIG_PARALLEL_MP_AP_WORK=y
-# CONFIG_UDELAY_IO is not set
 # CONFIG_UDELAY_LAPIC is not set
 CONFIG_UDELAY_TSC=y
 CONFIG_TSC_CONSTANT_RATE=y
 CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_UDELAY_TIMER2 is not set
 # CONFIG_TSC_SYNC_LFENCE is not set
 CONFIG_TSC_SYNC_MFENCE=y
 CONFIG_NO_FIXED_XIP_ROM_SIZE=y
 CONFIG_LOGICAL_CPUS=y
+CONFIG_HAVE_SMI_HANDLER=y
+# CONFIG_NO_SMM is not set
+# CONFIG_SMM_ASEG is not set
 CONFIG_SMM_TSEG=y
 CONFIG_SMM_MODULE_HEAP_SIZE=0x4000
 CONFIG_SMM_STUB_STACK_SIZE=0x400
 # CONFIG_SMM_LAPIC_REMAP_MITIGATION is not set
 # CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
 # CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
@@ -398,7 +399,6 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_MAX_PIRQ_LINKS=4
 
 #
 # Southbridge
@@ -420,7 +420,8 @@ CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
 #
 # Super I/O
 #
-# CONFIG_SUPERIO_NUVOTON_NCT6776_COM_A is not set
+# CONFIG_SUPERIO_ASPEED_AST2400 is not set
+# CONFIG_SUPERIO_ASPEED_COMMON_PRE_RAM is not set
 
 #
 # Embedded Controllers
@@ -438,7 +439,11 @@ CONFIG_EC_BASE_PACKET=0x950
 #
 CONFIG_HAVE_ME_BIN=y
 # CONFIG_CHECK_ME is not set
-# CONFIG_USE_ME_CLEANER is not set
+CONFIG_USE_ME_CLEANER=y
+
+#
+# Please test the modified ME/TXE firmware and coreboot in two steps
+#
 # CONFIG_MAINBOARD_USES_IFD_GBE_REGION is not set
 # CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
 # CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
@@ -486,28 +491,11 @@ CONFIG_UDK_VERSION=2015
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
 # CONFIG_ARM64_USE_ARCH_TIMER is not set
 # CONFIG_ARM64_A53_ERRATUM_843419 is not set
-# CONFIG_ARCH_MIPS is not set
-# CONFIG_ARCH_BOOTBLOCK_MIPS is not set
-# CONFIG_ARCH_VERSTAGE_MIPS is not set
-# CONFIG_ARCH_ROMSTAGE_MIPS is not set
-# CONFIG_ARCH_RAMSTAGE_MIPS is not set
 # CONFIG_ARCH_PPC64 is not set
 # CONFIG_ARCH_BOOTBLOCK_PPC64 is not set
 # CONFIG_ARCH_VERSTAGE_PPC64 is not set
 # CONFIG_ARCH_ROMSTAGE_PPC64 is not set
 # CONFIG_ARCH_RAMSTAGE_PPC64 is not set
-# CONFIG_ARCH_RISCV is not set
-CONFIG_ARCH_RISCV_M=y
-# CONFIG_ARCH_RISCV_S is not set
-# CONFIG_ARCH_RISCV_U is not set
-# CONFIG_ARCH_RISCV_RV64 is not set
-# CONFIG_ARCH_RISCV_RV32 is not set
-# CONFIG_ARCH_RISCV_PMP is not set
-# CONFIG_ARCH_BOOTBLOCK_RISCV is not set
-# CONFIG_ARCH_VERSTAGE_RISCV is not set
-# CONFIG_ARCH_ROMSTAGE_RISCV is not set
-# CONFIG_ARCH_RAMSTAGE_RISCV is not set
-# CONFIG_RISCV_USE_ARCH_TIMER is not set
 CONFIG_ARCH_X86=y
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -539,15 +527,13 @@ CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POSTCAR_STAGE=y
 # CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
 # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
-CONFIG_BOOTBLOCK_SIMPLE=y
-# CONFIG_BOOTBLOCK_NORMAL is not set
-CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 CONFIG_ACPI_HAVE_PCAT_8259=y
 # CONFIG_COLLECT_TIMESTAMPS_NO_TSC is not set
 CONFIG_COLLECT_TIMESTAMPS_TSC=y
 # CONFIG_PAGING_IN_CACHE_AS_RAM is not set
 # CONFIG_IDT_IN_EVERY_STAGE is not set
 CONFIG_HAVE_CF9_RESET=y
+# CONFIG_PIRQ_ROUTE is not set
 
 #
 # Devices
@@ -576,8 +562,6 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # CONFIG_EARLY_PCI_BRIDGE is not set
-CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
-CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 CONFIG_INTEL_GMA_HAVE_VBT=y
 CONFIG_INTEL_GMA_ADD_VBT=y
 # CONFIG_SOFTWARE_I2C is not set
@@ -591,7 +575,6 @@ CONFIG_INTEL_GMA_ADD_VBT=y
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
 CONFIG_CACHE_MRC_SETTINGS=y
-CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_MRC_SETTINGS_PROTECT=y
 # CONFIG_HAS_RECOVERY_MRC_CACHE is not set
 # CONFIG_MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN is not set
@@ -612,7 +595,6 @@ CONFIG_SPI_FLASH_SMM=y
 # CONFIG_SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B is not set
 # CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
-CONFIG_TPM_INIT=y
 CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
@@ -625,6 +607,8 @@ CONFIG_NO_UART_ON_SUPERIO=y
 # CONFIG_HAVE_USBDEBUG is not set
 # CONFIG_HAVE_USBDEBUG_OPTIONS is not set
 # CONFIG_VPD is not set
+CONFIG_DRIVERS_GENERIC_WIFI=y
+# CONFIG_USE_SAR is not set
 # CONFIG_DRIVERS_AMD_PI is not set
 # CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
 CONFIG_DRIVERS_I2C_DESIGNWARE=y
@@ -640,6 +624,7 @@ 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
@@ -661,11 +646,12 @@ CONFIG_INTEL_GMA_ACPI=y
 # CONFIG_DRIVER_INTEL_I210 is not set
 # CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set
 CONFIG_DRIVERS_INTEL_WIFI=y
-# CONFIG_USE_SAR 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_MC146818=y
 CONFIG_LPC_TPM=y
 CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
@@ -697,6 +683,12 @@ CONFIG_TPM2=y
 CONFIG_MAINBOARD_HAS_TPM2=y
 # CONFIG_DEBUG_TPM is not set
 # CONFIG_TPM_RDRESP_NEED_DELAY is not set
+
+#
+# Memory initialization
+#
+CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
+# CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT is not set
 # CONFIG_ACPI_SATA_GENERATOR is not set
 CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
 # CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
@@ -736,12 +728,10 @@ 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_GENERIC_UDELAY is not set
 # CONFIG_TIMER_QUEUE is not set
 CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PIRQ_ROUTE is not set
-CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
 # CONFIG_USE_WATCHDOG_ON_BOOT is not set
@@ -804,7 +794,6 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
 #
 CONFIG_HAVE_DISPLAY_MTRRS=y
 # CONFIG_DISPLAY_MTRRS is not set
-# CONFIG_DEBUG_SMM_RELOCATION is not set
 
 #
 # General Debug Settings
@@ -826,6 +815,7 @@ CONFIG_HAVE_DEBUG_GPIO=y
 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
@@ -838,5 +828,4 @@ CONFIG_REG_SCRIPT=y
 # CONFIG_EARLY_CBMEM_LIST is not set
 CONFIG_RELOCATABLE_MODULES=y
 CONFIG_GENERIC_GPIO_LIB=y
-CONFIG_SPD_READ_BY_WORD=y
 CONFIG_C_ENVIRONMENT_BOOTBLOCK=y