Update configs

models/darp5/coreboot.config

@@ -22,6 +22,7 @@ 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
@@ -122,10 +123,10 @@ CONFIG_CPU_MICROCODE_CBFS_LOC=0x0
 CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_DRIVERS_INTEL_WIFI=y
 # CONFIG_VBOOT is not set
 # CONFIG_DRIVERS_UART_8250IO is not set
 CONFIG_DIMM_MAX=2
-CONFIG_TTYS0_LCS=3
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Darter Pro"
 CONFIG_IFD_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/fd.rom"
 CONFIG_ME_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/me.rom"
@@ -138,8 +139,8 @@ CONFIG_FSP_M_CBFS="fspm.bin"
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7
 CONFIG_MAINBOARD_VERSION="darp5"
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
-CONFIG_DRIVERS_INTEL_WIFI=y
 CONFIG_PCIEXP_L1_SUB_STATE=y
+# CONFIG_NO_POST is not set
 CONFIG_SMBIOS_ENCLOSURE_TYPE=0x09
 CONFIG_HEAP_SIZE=0x8000
 CONFIG_CONSOLE_POST=y
@@ -232,7 +233,6 @@ CONFIG_PCIEXP_ASPM=y
 CONFIG_PCIEXP_COMMON_CLOCK=y
 CONFIG_PCIEXP_CLK_PM=y
 CONFIG_IED_REGION_SIZE=0x400000
-CONFIG_TTYS0_BASE=0x3e8
 CONFIG_SOC_INTEL_CANNONLAKE_BASE=y
 CONFIG_SOC_INTEL_CANNONLAKE_ALTERNATE_HEADERS=y
 CONFIG_SOC_INTEL_WHISKEYLAKE=y
@@ -344,6 +344,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
@@ -371,7 +372,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 is not set
@@ -430,6 +430,7 @@ 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
 
 #
@@ -479,7 +480,6 @@ CONFIG_RAMTOP=0x1000000
 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
@@ -592,6 +592,7 @@ CONFIG_DRIVERS_I2C_DESIGNWARE=y
 # CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCA9538 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 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
@@ -680,25 +681,13 @@ CONFIG_RTC=y
 CONFIG_BOOTBLOCK_CONSOLE=y
 CONFIG_POSTCAR_CONSOLE=y
 CONFIG_SQUELCH_EARLY_SMP=y
-CONFIG_CONSOLE_SERIAL=y
+# CONFIG_CONSOLE_SERIAL is not set
 CONFIG_FIXED_UART_FOR_CONSOLE=y
-
-#
-# memory mapped, 8250-compatible
-#
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-CONFIG_CONSOLE_SERIAL_115200=y
-# CONFIG_CONSOLE_SERIAL_57600 is not set
-# CONFIG_CONSOLE_SERIAL_38400 is not set
-# CONFIG_CONSOLE_SERIAL_19200 is not set
-# CONFIG_CONSOLE_SERIAL_9600 is not set
-CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
 # CONFIG_CONSOLE_SPI_FLASH is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8 is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7=y
@@ -709,7 +698,6 @@ 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_CMOS_POST is not set
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
 CONFIG_HWBASE_DEBUG_CB=y
@@ -781,7 +769,6 @@ CONFIG_HAVE_DISPLAY_MTRRS=y
 #
 # 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
@@ -799,6 +786,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
@@ -814,5 +802,4 @@ CONFIG_RELOCATABLE_MODULES=y
 CONFIG_GENERIC_GPIO_LIB=y
 CONFIG_C_ENVIRONMENT_BOOTBLOCK=y
 CONFIG_HAVE_ROMSTAGE=y
-CONFIG_HAVE_POSTCAR=y
 CONFIG_HAVE_RAMSTAGE=y

models/darp6/coreboot.config

@@ -22,6 +22,7 @@ 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
@@ -122,6 +123,7 @@ CONFIG_CPU_MICROCODE_CBFS_LOC=0x0
 CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_DRIVERS_INTEL_WIFI=y
 # CONFIG_VBOOT is not set
 # CONFIG_DRIVERS_UART_8250IO is not set
 CONFIG_DIMM_MAX=2
@@ -137,8 +139,8 @@ CONFIG_FSP_M_CBFS="fspm.bin"
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7
 CONFIG_MAINBOARD_VERSION="darp6"
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
-CONFIG_DRIVERS_INTEL_WIFI=y
 CONFIG_PCIEXP_L1_SUB_STATE=y
+# CONFIG_NO_POST is not set
 CONFIG_SMBIOS_ENCLOSURE_TYPE=0x09
 CONFIG_HEAP_SIZE=0x8000
 CONFIG_CONSOLE_POST=y
@@ -343,6 +345,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
@@ -370,7 +373,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 is not set
@@ -429,6 +431,7 @@ 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
 
 #
@@ -478,7 +481,6 @@ CONFIG_RAMTOP=0x1000000
 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
@@ -591,6 +593,7 @@ CONFIG_DRIVERS_I2C_DESIGNWARE=y
 # CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCA9538 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 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
@@ -695,7 +698,6 @@ 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_CMOS_POST is not set
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
 CONFIG_HWBASE_DEBUG_CB=y
@@ -784,6 +786,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
@@ -799,5 +802,4 @@ CONFIG_RELOCATABLE_MODULES=y
 CONFIG_GENERIC_GPIO_LIB=y
 CONFIG_C_ENVIRONMENT_BOOTBLOCK=y
 CONFIG_HAVE_ROMSTAGE=y
-CONFIG_HAVE_POSTCAR=y
 CONFIG_HAVE_RAMSTAGE=y

models/galp3-c/coreboot.config

@@ -127,7 +127,6 @@ CONFIG_DRIVERS_INTEL_WIFI=y
 # CONFIG_VBOOT is not set
 # CONFIG_DRIVERS_UART_8250IO is not set
 CONFIG_DIMM_MAX=2
-CONFIG_TTYS0_LCS=3
 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"
@@ -234,7 +233,6 @@ CONFIG_PCIEXP_ASPM=y
 CONFIG_PCIEXP_COMMON_CLOCK=y
 CONFIG_PCIEXP_CLK_PM=y
 CONFIG_IED_REGION_SIZE=0x400000
-CONFIG_TTYS0_BASE=0x3e8
 CONFIG_SOC_INTEL_CANNONLAKE_BASE=y
 CONFIG_SOC_INTEL_CANNONLAKE_ALTERNATE_HEADERS=y
 CONFIG_SOC_INTEL_WHISKEYLAKE=y
@@ -683,25 +681,13 @@ CONFIG_RTC=y
 CONFIG_BOOTBLOCK_CONSOLE=y
 CONFIG_POSTCAR_CONSOLE=y
 CONFIG_SQUELCH_EARLY_SMP=y
-CONFIG_CONSOLE_SERIAL=y
+# CONFIG_CONSOLE_SERIAL is not set
 CONFIG_FIXED_UART_FOR_CONSOLE=y
-
-#
-# memory mapped, 8250-compatible
-#
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-CONFIG_CONSOLE_SERIAL_115200=y
-# CONFIG_CONSOLE_SERIAL_57600 is not set
-# CONFIG_CONSOLE_SERIAL_38400 is not set
-# CONFIG_CONSOLE_SERIAL_19200 is not set
-# CONFIG_CONSOLE_SERIAL_9600 is not set
-CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
 # CONFIG_CONSOLE_SPI_FLASH is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8 is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7=y
@@ -783,7 +769,6 @@ CONFIG_HAVE_DISPLAY_MTRRS=y
 #
 # 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

models/galp4/coreboot.config

@@ -22,6 +22,7 @@ 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
@@ -122,6 +123,7 @@ CONFIG_CPU_MICROCODE_CBFS_LOC=0x0
 CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_DRIVERS_INTEL_WIFI=y
 # CONFIG_VBOOT is not set
 # CONFIG_DRIVERS_UART_8250IO is not set
 CONFIG_DIMM_MAX=2
@@ -137,8 +139,8 @@ CONFIG_FSP_M_CBFS="fspm.bin"
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7
 CONFIG_MAINBOARD_VERSION="galp4"
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
-CONFIG_DRIVERS_INTEL_WIFI=y
 CONFIG_PCIEXP_L1_SUB_STATE=y
+# CONFIG_NO_POST is not set
 CONFIG_SMBIOS_ENCLOSURE_TYPE=0x09
 CONFIG_HEAP_SIZE=0x8000
 CONFIG_CONSOLE_POST=y
@@ -343,6 +345,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
@@ -370,7 +373,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 is not set
@@ -429,6 +431,7 @@ 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
 
 #
@@ -478,7 +481,6 @@ CONFIG_RAMTOP=0x1000000
 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
@@ -591,6 +593,7 @@ CONFIG_DRIVERS_I2C_DESIGNWARE=y
 # CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCA9538 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 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
@@ -695,7 +698,6 @@ 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_CMOS_POST is not set
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
 CONFIG_HWBASE_DEBUG_CB=y
@@ -784,6 +786,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
@@ -799,5 +802,4 @@ CONFIG_RELOCATABLE_MODULES=y
 CONFIG_GENERIC_GPIO_LIB=y
 CONFIG_C_ENVIRONMENT_BOOTBLOCK=y
 CONFIG_HAVE_ROMSTAGE=y
-CONFIG_HAVE_POSTCAR=y
 CONFIG_HAVE_RAMSTAGE=y

models/qemu/coreboot.config

@@ -122,6 +122,7 @@ CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
 CONFIG_MMCONF_BASE_ADDRESS=0xb0000000
 # CONFIG_HAVE_INTEL_FIRMWARE is not set
 CONFIG_POST_DEVICE=y
+CONFIG_DRIVERS_INTEL_WIFI=y
 # CONFIG_VBOOT is not set
 CONFIG_DRIVERS_UART_8250IO=y
 CONFIG_DIMM_MAX=4
@@ -131,8 +132,8 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7
 # CONFIG_USBDEBUG is not set
 CONFIG_MAINBOARD_VERSION="1.0"
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
-CONFIG_DRIVERS_INTEL_WIFI=y
 # CONFIG_PCIEXP_L1_SUB_STATE is not set
+# CONFIG_NO_POST is not set
 CONFIG_SMBIOS_ENCLOSURE_TYPE=0x03
 CONFIG_HEAP_SIZE=0x4000
 # CONFIG_CONSOLE_POST is not set
@@ -200,6 +201,7 @@ CONFIG_UART_PCI_ADDR=0x0
 # 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
@@ -224,7 +226,7 @@ CONFIG_CPU_QEMU_X86=y
 # CONFIG_PARALLEL_MP is not set
 # CONFIG_UDELAY_LAPIC is not set
 CONFIG_UDELAY_TSC=y
-# CONFIG_TSC_CONSTANT_RATE is not set
+CONFIG_UNKNOWN_TSC_RATE=y
 CONFIG_TSC_MONOTONIC_TIMER=y
 # CONFIG_TSC_SYNC_LFENCE is not set
 # CONFIG_TSC_SYNC_MFENCE is not set
@@ -253,13 +255,13 @@ CONFIG_SMP=y
 #
 # Southbridge
 #
-CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
 # 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=y
 CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
 CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
 CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
 CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI is not set
@@ -278,6 +280,7 @@ CONFIG_SOUTHBRIDGE_INTEL_I82801IX=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
 
 #
@@ -316,7 +319,6 @@ CONFIG_RAMTOP=0x1000000
 # CONFIG_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
-# CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
 # CONFIG_HAVE_CMOS_DEFAULT is not set
 CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS=y
 # CONFIG_HPET_ADDRESS_OVERRIDE is not set
@@ -403,6 +405,7 @@ CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_YRES=768
 # CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCA9538 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 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
@@ -513,7 +516,6 @@ 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_CMOS_POST is not set
 CONFIG_POST_DEVICE_NONE=y
 # CONFIG_POST_DEVICE_LPC is not set
@@ -600,6 +602,7 @@ CONFIG_HAVE_DEBUG_SMBUS=y
 # CONFIG_DEBUG_BOOT_STATE is not set
 # CONFIG_DEBUG_ADA_CODE is not set
 # CONFIG_HAVE_EM100_SUPPORT is not set
+CONFIG_RAMSTAGE_CBMEM_TOP_ARG=y
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
@@ -614,5 +617,4 @@ CONFIG_RELOCATABLE_MODULES=y
 CONFIG_NO_STAGE_CACHE=y
 CONFIG_C_ENVIRONMENT_BOOTBLOCK=y
 CONFIG_HAVE_ROMSTAGE=y
-CONFIG_HAVE_POSTCAR=y
 CONFIG_HAVE_RAMSTAGE=y