summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--Makefile1
-rw-r--r--resources/coreboot/d510mo/board.cfg2
-rw-r--r--resources/coreboot/d510mo/config/libgfxinit_txtmode271
-rw-r--r--resources/coreboot/d510mo_16mb/board.cfg2
-rw-r--r--resources/coreboot/d510mo_16mb/config/libgfxinit_txtmode252
-rw-r--r--resources/coreboot/d945gclf/board.cfg2
-rw-r--r--resources/coreboot/d945gclf/config/libgfxinit_txtmode274
-rw-r--r--resources/coreboot/d945gclf_16mb/board.cfg2
-rw-r--r--resources/coreboot/d945gclf_16mb/config/libgfxinit_txtmode255
-rw-r--r--resources/coreboot/default/board.cfg31
-rw-r--r--resources/coreboot/default/deblob-check.results.list849
-rw-r--r--resources/coreboot/default/patches/0001-apple-macbook21-Set-default-VRAM-to-64MiB-instead-of.patch (renamed from resources/coreboot/macbook21/patches/0001-apple-macbook21-Set-default-VRAM-to-64MiB-instead-of.patch)4
-rw-r--r--resources/coreboot/default/patches/0001-hardcode-tianocore-revisions-and-don-t-automatically.patch128
-rw-r--r--resources/coreboot/default/patches/0002-add-c3-and-clockgen-to-apple-macbook21.patch (renamed from resources/coreboot/macbook21/patches/0002-add-c3-and-clockgen-to-apple-macbook21.patch)4
-rw-r--r--resources/coreboot/default/patches/0003-lenovo-x60-64MiB-Video-RAM-changed-to-default-previo.patch (renamed from resources/coreboot/default/patches/0002-lenovo-x60-64MiB-Video-RAM-changed-to-default-previo.patch)4
-rw-r--r--resources/coreboot/default/patches/0004-lenovo-t60-make-64MiB-VRAM-the-default-in-cmos.defau.patch (renamed from resources/coreboot/default/patches/0003-lenovo-t60-make-64MiB-VRAM-the-default-in-cmos.defau.patch)4
-rw-r--r--resources/coreboot/default/patches/0005-lenovo-t400-set-VRAM-to-352MiB-VRAM-by-default.patch (renamed from resources/coreboot/default/patches/0014-lenovo-t400-set-VRAM-to-352MiB-VRAM-by-default.patch)4
-rw-r--r--resources/coreboot/default/patches/0005-util-cbfstool-Do-not-set-D_XOPEN_SOURCE-on-FreeBSD.patch46
-rw-r--r--resources/coreboot/default/patches/0006-lenovo-x200-set-VRAM-to-352MiB-by-default.patch (renamed from resources/coreboot/default/patches/0015-lenovo-x200-set-VRAM-to-352MiB-by-default.patch)4
-rw-r--r--resources/coreboot/default/patches/0006-src-security-intel-stm-Add-warning-for-non-reproduci.patch35
-rw-r--r--resources/coreboot/default/patches/0007-Makefile-Don-t-run-genbuild_h-if-not-doing-a-build.patch36
-rw-r--r--resources/coreboot/default/patches/0007-gigabyte-ga-g41m-es2l-set-VRAM-to-352MiB-by-default.patch (renamed from resources/coreboot/default/patches/0016-gigabyte-ga-g41m-es2l-set-VRAM-to-352MiB-by-default.patch)4
-rw-r--r--resources/coreboot/default/patches/0008-acer-g43t-am3-set-VRAM-to-352MiB-by-default.patch (renamed from resources/coreboot/default/patches/0017-acer-g43t-am3-set-VRAM-to-352MiB-by-default.patch)4
-rw-r--r--resources/coreboot/default/patches/0008-util-genbuild_h-Update-IASL-location-finding-code.patch74
-rw-r--r--resources/coreboot/default/patches/0009-Revert-cpu-intel-Configure-IA32_FEATURE_CONTROL-for-.patch (renamed from resources/coreboot/default/patches/0018-Revert-cpu-intel-Configure-IA32_FEATURE_CONTROL-for-.patch)12
-rw-r--r--resources/coreboot/default/patches/0009-util-crossgcc-Update-gmp-to-6.2.1.patch54
-rw-r--r--resources/coreboot/default/patches/0010-Fix-missing-include.patch (renamed from resources/coreboot/default/patches/0019-Fix-missing-include.patch)8
-rw-r--r--resources/coreboot/default/patches/0010-util-crossgcc-Update-mpc-to-1.2.1.patch48
-rw-r--r--resources/coreboot/default/patches/0011-lenovo-t400-Enable-all-SATA-ports.patch (renamed from resources/coreboot/default/patches/0020-lenovo-t400-Enable-all-SATA-ports.patch)6
-rw-r--r--resources/coreboot/default/patches/0011-tests-Enable-config-override-for-tests.patch76
-rw-r--r--resources/coreboot/default/patches/0012-src-Match-array-format-in-function-declarations-and-.patch193
-rw-r--r--resources/coreboot/default/patches/0013-src-security-tpm-Deal-with-zero-length-tlcl-writes.patch36
-rw-r--r--resources/coreboot/fam15h_rdimm/board.cfg2
-rw-r--r--resources/coreboot/fam15h_udimm/board.cfg2
-rw-r--r--resources/coreboot/g43t-am3/board.cfg2
-rw-r--r--resources/coreboot/g43t-am3/config/libgfxinit_txtmode291
-rw-r--r--resources/coreboot/g43t-am3_16mb/board.cfg2
-rw-r--r--resources/coreboot/g43t-am3_16mb/config/libgfxinit_txtmode274
-rw-r--r--resources/coreboot/ga-g41m-es2l/board.cfg2
-rw-r--r--resources/coreboot/ga-g41m-es2l/config/libgfxinit_txtmode281
-rw-r--r--resources/coreboot/kcma-d8-rdimm_16mb/board.cfg2
-rw-r--r--resources/coreboot/kcma-d8-rdimm_16mb/config/libgfxinit_txtmode4
-rw-r--r--resources/coreboot/kcma-d8-rdimm_2mb/board.cfg2
-rw-r--r--resources/coreboot/kcma-d8-rdimm_2mb/config/libgfxinit_txtmode19
-rw-r--r--resources/coreboot/kcma-d8-udimm_16mb/board.cfg2
-rw-r--r--resources/coreboot/kcma-d8-udimm_16mb/config/libgfxinit_txtmode4
-rw-r--r--resources/coreboot/kcma-d8-udimm_2mb/board.cfg2
-rw-r--r--resources/coreboot/kcma-d8-udimm_2mb/config/libgfxinit_txtmode19
-rw-r--r--resources/coreboot/kfsn4-dre_1mb/board.cfg2
-rw-r--r--resources/coreboot/kfsn4-dre_1mb/config/libgfxinit_txtmode15
-rw-r--r--resources/coreboot/kfsn4-dre_2mb/board.cfg2
-rw-r--r--resources/coreboot/kgpe-d16-rdimm_16mb/board.cfg2
-rw-r--r--resources/coreboot/kgpe-d16-rdimm_2mb/board.cfg2
-rw-r--r--resources/coreboot/kgpe-d16-rdimm_2mb/config/libgfxinit_txtmode13
-rw-r--r--resources/coreboot/kgpe-d16-udimm_16mb/board.cfg2
-rw-r--r--resources/coreboot/kgpe-d16-udimm_2mb/board.cfg2
-rw-r--r--resources/coreboot/kgpe-d16-udimm_2mb/config/libgfxinit_txtmode13
-rw-r--r--resources/coreboot/macbook11/board.cfg4
-rw-r--r--resources/coreboot/macbook11/config/libgfxinit_corebootfb12
-rw-r--r--resources/coreboot/macbook11/config/libgfxinit_txtmode12
-rw-r--r--resources/coreboot/macbook21/blobs.list22
-rw-r--r--resources/coreboot/macbook21/board.cfg5
-rw-r--r--resources/coreboot/macbook21/config/libgfxinit_corebootfb12
-rw-r--r--resources/coreboot/macbook21/config/libgfxinit_txtmode12
-rw-r--r--resources/coreboot/r400_16mb/board.cfg2
-rw-r--r--resources/coreboot/r400_16mb/config/libgfxinit_corebootfb263
-rw-r--r--resources/coreboot/r400_16mb/config/libgfxinit_txtmode263
-rw-r--r--resources/coreboot/r400_4mb/board.cfg2
-rw-r--r--resources/coreboot/r400_4mb/config/libgfxinit_corebootfb263
-rw-r--r--resources/coreboot/r400_4mb/config/libgfxinit_txtmode263
-rw-r--r--resources/coreboot/r400_8mb/board.cfg2
-rw-r--r--resources/coreboot/r400_8mb/config/libgfxinit_corebootfb263
-rw-r--r--resources/coreboot/r400_8mb/config/libgfxinit_txtmode263
-rw-r--r--resources/coreboot/r500_4mb/board.cfg2
-rw-r--r--resources/coreboot/r500_4mb/config/libgfxinit_corebootfb264
-rw-r--r--resources/coreboot/r500_4mb/config/libgfxinit_txtmode264
-rw-r--r--resources/coreboot/t400_16mb/board.cfg2
-rw-r--r--resources/coreboot/t400_16mb/config/libgfxinit_corebootfb263
-rw-r--r--resources/coreboot/t400_16mb/config/libgfxinit_txtmode263
-rw-r--r--resources/coreboot/t400_4mb/board.cfg2
-rw-r--r--resources/coreboot/t400_4mb/config/libgfxinit_corebootfb263
-rw-r--r--resources/coreboot/t400_4mb/config/libgfxinit_txtmode263
-rw-r--r--resources/coreboot/t400_8mb/board.cfg2
-rw-r--r--resources/coreboot/t400_8mb/config/libgfxinit_corebootfb263
-rw-r--r--resources/coreboot/t400_8mb/config/libgfxinit_txtmode263
-rw-r--r--resources/coreboot/t500_16mb/board.cfg2
-rw-r--r--resources/coreboot/t500_16mb/config/libgfxinit_corebootfb263
-rw-r--r--resources/coreboot/t500_16mb/config/libgfxinit_txtmode263
-rw-r--r--resources/coreboot/t500_4mb/board.cfg2
-rw-r--r--resources/coreboot/t500_4mb/config/libgfxinit_corebootfb263
-rw-r--r--resources/coreboot/t500_4mb/config/libgfxinit_txtmode263
-rw-r--r--resources/coreboot/t500_8mb/board.cfg2
-rw-r--r--resources/coreboot/t500_8mb/config/libgfxinit_corebootfb263
-rw-r--r--resources/coreboot/t500_8mb/config/libgfxinit_txtmode263
-rw-r--r--resources/coreboot/t60_16mb_intelgpu/board.cfg2
-rw-r--r--resources/coreboot/t60_16mb_intelgpu/config/libgfxinit_corebootfb258
-rw-r--r--resources/coreboot/t60_16mb_intelgpu/config/libgfxinit_txtmode258
-rw-r--r--resources/coreboot/t60_intelgpu/board.cfg2
-rw-r--r--resources/coreboot/t60_intelgpu/config/libgfxinit_corebootfb258
-rw-r--r--resources/coreboot/t60_intelgpu/config/libgfxinit_txtmode258
-rw-r--r--resources/coreboot/w500_16mb/board.cfg2
-rw-r--r--resources/coreboot/w500_16mb/config/libgfxinit_corebootfb263
-rw-r--r--resources/coreboot/w500_16mb/config/libgfxinit_txtmode263
-rw-r--r--resources/coreboot/w500_4mb/board.cfg2
-rw-r--r--resources/coreboot/w500_4mb/config/libgfxinit_corebootfb263
-rw-r--r--resources/coreboot/w500_4mb/config/libgfxinit_txtmode263
-rw-r--r--resources/coreboot/w500_8mb/board.cfg2
-rw-r--r--resources/coreboot/w500_8mb/config/libgfxinit_corebootfb263
-rw-r--r--resources/coreboot/w500_8mb/config/libgfxinit_txtmode263
-rw-r--r--resources/coreboot/x200_16mb/board.cfg2
-rw-r--r--resources/coreboot/x200_16mb/config/libgfxinit_corebootfb264
-rw-r--r--resources/coreboot/x200_16mb/config/libgfxinit_txtmode264
-rw-r--r--resources/coreboot/x200_4mb/board.cfg2
-rw-r--r--resources/coreboot/x200_4mb/config/libgfxinit_corebootfb264
-rw-r--r--resources/coreboot/x200_4mb/config/libgfxinit_txtmode264
-rw-r--r--resources/coreboot/x200_8mb/board.cfg2
-rw-r--r--resources/coreboot/x200_8mb/config/libgfxinit_corebootfb264
-rw-r--r--resources/coreboot/x200_8mb/config/libgfxinit_txtmode264
-rw-r--r--resources/coreboot/x301_16mb/board.cfg2
-rw-r--r--resources/coreboot/x301_16mb/config/libgfxinit_corebootfb268
-rw-r--r--resources/coreboot/x301_16mb/config/libgfxinit_txtmode268
-rw-r--r--resources/coreboot/x301_4mb/board.cfg2
-rw-r--r--resources/coreboot/x301_4mb/config/libgfxinit_corebootfb268
-rw-r--r--resources/coreboot/x301_4mb/config/libgfxinit_txtmode285
-rw-r--r--resources/coreboot/x301_8mb/board.cfg2
-rw-r--r--resources/coreboot/x301_8mb/config/libgfxinit_corebootfb268
-rw-r--r--resources/coreboot/x301_8mb/config/libgfxinit_txtmode268
-rw-r--r--resources/coreboot/x60/board.cfg2
-rw-r--r--resources/coreboot/x60/config/libgfxinit_corebootfb256
-rw-r--r--resources/coreboot/x60/config/libgfxinit_txtmode256
-rw-r--r--resources/coreboot/x60_16mb/board.cfg2
-rw-r--r--resources/coreboot/x60_16mb/config/libgfxinit_corebootfb256
-rw-r--r--resources/coreboot/x60_16mb/config/libgfxinit_txtmode256
-rw-r--r--resources/grub/config/grub.cfg6
-rwxr-xr-xresources/scripts/build/boot/roms_helper64
-rwxr-xr-xresources/scripts/build/clean/tianocore30
-rwxr-xr-xresources/scripts/build/payload/tianocore79
-rwxr-xr-xresources/scripts/build/release/src7
-rwxr-xr-xresources/scripts/download/tianocore33
-rwxr-xr-xresources/scripts/update/tianocore/configs55
-rw-r--r--resources/tianocore/dummy.coreboot.config791
142 files changed, 2569 insertions, 14415 deletions
diff --git a/.gitignore b/.gitignore
index 6bb0a55c..fa154b55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
*~
/TODO
/ich9utils/
-/tianocore/
/tmp/
/payload/
/me_cleaner/
diff --git a/Makefile b/Makefile
index 8e342403..5749c974 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,6 @@ clean:
./build clean grub
./build clean memtest86plus
./build clean rom_images
- ./build clean tianocore
crossgcc-clean:
./build clean crossgcc
diff --git a/resources/coreboot/d510mo/board.cfg b/resources/coreboot/d510mo/board.cfg
index dd75ef49..df74b20e 100644
--- a/resources/coreboot/d510mo/board.cfg
+++ b/resources/coreboot/d510mo/board.cfg
@@ -3,6 +3,4 @@ romtype="normal"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
diff --git a/resources/coreboot/d510mo/config/libgfxinit_txtmode b/resources/coreboot/d510mo/config/libgfxinit_txtmode
index ba741528..61751b3f 100644
--- a/resources/coreboot/d510mo/config/libgfxinit_txtmode
+++ b/resources/coreboot/d510mo/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -118,34 +117,28 @@ CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
CONFIG_POST_DEVICE=y
-# CONFIG_BOARD_EMULATION_QEMU_AARCH64 is not set
-# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
-# CONFIG_BOARD_EMULATION_QEMU_POWER8 is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
-# CONFIG_BOARD_EMULATION_QEMU_RISCV_RV64 is not set
-# CONFIG_BOARD_EMULATION_QEMU_RISCV_RV32 is not set
-# CONFIG_BOARD_EMULATION_SPIKE_RISCV is not set
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x4000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xe0000000
-CONFIG_MMCONF_BUS_NUMBER=256
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
# CONFIG_BOARD_INTEL_ADLRVP_P is not set
# CONFIG_BOARD_INTEL_ADLRVP_P_EXT_EC is not set
+# CONFIG_BOARD_INTEL_ADLRVP_P_MCHP is not set
# CONFIG_BOARD_INTEL_ADLRVP_M is not set
# CONFIG_BOARD_INTEL_ADLRVP_M_EXT_EC is not set
# CONFIG_BOARD_INTEL_APOLLOLAKE_RVP1 is not set
@@ -188,10 +181,7 @@ CONFIG_BOARD_INTEL_D510MO=y
# CONFIG_BOARD_INTEL_TGLRVP_UP3 is not set
# CONFIG_BOARD_INTEL_TGLRVP_UP4 is not set
# CONFIG_BOARD_INTEL_WTM2 is not set
-# CONFIG_ADL_CHROME_EC is not set
-# CONFIG_ADL_INTEL_EC is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="D510MO"
-# CONFIG_BOARD_INTEL_BASEBOARD_GLKRVP is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
@@ -220,11 +210,7 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
-# CONFIG_SYSTEM_TYPE_LAPTOP is not set
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
+# end of Mainboard
#
# Chipset
@@ -233,67 +219,42 @@ CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=32
CONFIG_SMM_RESERVED_SIZE=0x80000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=3
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
CONFIG_INTEL_HAS_TOP_SWAP=y
# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set
CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_106CX=y
CONFIG_CPU_INTEL_SOCKET_FCBGA559=y
CONFIG_SOCKET_SPECIFIC_OPTIONS=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -302,34 +263,24 @@ CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
CONFIG_CPU_HAS_L2_ENABLE_MSR=y
-# CONFIG_CPU_QEMU_X86_LAPIC_INIT is not set
-# CONFIG_CPU_QEMU_X86_PARALLEL_MP is not set
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=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=y
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -338,37 +289,30 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_PINEVIEW=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7=y
-# 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=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE is not set
CONFIG_INTEL_CHIPSET_LOCKDOWN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_WATCHDOG=y
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -378,28 +322,12 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_WINBOND_COMMON_PRE_RAM=y
CONFIG_SUPERIO_WINBOND_W83627THG=y
#
# Embedded Controllers
#
-# CONFIG_EC_51NB_NPCE985LA0DX is not set
-# CONFIG_EC_GOOGLE_CHROMEEC_SKUID is not set
-# CONFIG_EC_GOOGLE_WILCO is not set
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -407,59 +335,43 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
CONFIG_SIPI_VECTOR_IN_ROM=y
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
-# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
# CONFIG_VGA_ROM_RUN is not set
-# CONFIG_RUN_FSP_GOP is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x10000000
+CONFIG_ECAM_MMCONF_LENGTH=0x10000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -469,32 +381,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -505,86 +403,25 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
-# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
CONFIG_DRIVERS_I2C_CK505=y
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
-# 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_IPMI_OCP 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_INTEL_GMA_OPREGION_2_0=y
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -593,32 +430,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -661,32 +501,23 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
-# CONFIG_GENERATE_MP_TABLE is not set
-# 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"
+# end of System tables
#
# Payload
@@ -702,15 +533,8 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_YABITS is not set
# CONFIG_PAYLOAD_LINUX is not set
# CONFIG_PAYLOAD_TIANOCORE is not set
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
-# CONFIG_SEABIOS_REVISION is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_COMPRESSED_PAYLOAD_NONE is not set
-# CONFIG_COMPRESSED_PAYLOAD_LZMA is not set
-# CONFIG_COMPRESSED_PAYLOAD_LZ4 is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -720,6 +544,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -728,6 +554,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -744,26 +571,16 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
-# CONFIG_SPD_CACHE_IN_FMAP is not set
+# end of Debugging
+
CONFIG_NO_CBFS_MCACHE=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/d510mo_16mb/board.cfg b/resources/coreboot/d510mo_16mb/board.cfg
index ff15c45f..6d02fbf6 100644
--- a/resources/coreboot/d510mo_16mb/board.cfg
+++ b/resources/coreboot/d510mo_16mb/board.cfg
@@ -3,7 +3,5 @@ romtype="normal"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/d510mo_16mb/config/libgfxinit_txtmode b/resources/coreboot/d510mo_16mb/config/libgfxinit_txtmode
index c7ea2d95..e4c702f7 100644
--- a/resources/coreboot/d510mo_16mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/d510mo_16mb/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -118,6 +117,8 @@ CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -127,17 +128,17 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x4000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xe0000000
-CONFIG_MMCONF_BUS_NUMBER=256
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
# CONFIG_BOARD_INTEL_ADLRVP_P is not set
# CONFIG_BOARD_INTEL_ADLRVP_P_EXT_EC is not set
+# CONFIG_BOARD_INTEL_ADLRVP_P_MCHP is not set
# CONFIG_BOARD_INTEL_ADLRVP_M is not set
# CONFIG_BOARD_INTEL_ADLRVP_M_EXT_EC is not set
# CONFIG_BOARD_INTEL_APOLLOLAKE_RVP1 is not set
@@ -181,7 +182,6 @@ CONFIG_BOARD_INTEL_D510MO=y
# CONFIG_BOARD_INTEL_TGLRVP_UP4 is not set
# CONFIG_BOARD_INTEL_WTM2 is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="D510MO"
-# CONFIG_BOARD_INTEL_BASEBOARD_GLKRVP is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
@@ -210,11 +210,7 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
-# CONFIG_SYSTEM_TYPE_LAPTOP is not set
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
+# end of Mainboard
#
# Chipset
@@ -223,67 +219,42 @@ CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=32
CONFIG_SMM_RESERVED_SIZE=0x80000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=3
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
CONFIG_INTEL_HAS_TOP_SWAP=y
# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set
CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_106CX=y
CONFIG_CPU_INTEL_SOCKET_FCBGA559=y
CONFIG_SOCKET_SPECIFIC_OPTIONS=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -292,32 +263,24 @@ CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
CONFIG_CPU_HAS_L2_ENABLE_MSR=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=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=y
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -326,37 +289,30 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_PINEVIEW=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7=y
-# 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=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE is not set
CONFIG_INTEL_CHIPSET_LOCKDOWN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_WATCHDOG=y
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -366,28 +322,12 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_WINBOND_COMMON_PRE_RAM=y
CONFIG_SUPERIO_WINBOND_W83627THG=y
#
# Embedded Controllers
#
-# CONFIG_EC_51NB_NPCE985LA0DX is not set
-# CONFIG_EC_GOOGLE_CHROMEEC_SKUID is not set
-# CONFIG_EC_GOOGLE_WILCO is not set
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -395,58 +335,43 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
CONFIG_SIPI_VECTOR_IN_ROM=y
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
-# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x10000000
+CONFIG_ECAM_MMCONF_LENGTH=0x10000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -456,32 +381,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -492,86 +403,25 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
-# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
CONFIG_DRIVERS_I2C_CK505=y
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
-# 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_IPMI_OCP 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_INTEL_GMA_OPREGION_2_0=y
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -580,32 +430,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -648,32 +501,23 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
-# CONFIG_GENERATE_MP_TABLE is not set
-# 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"
+# end of System tables
#
# Payload
@@ -691,7 +535,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -701,6 +544,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -709,6 +554,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -725,26 +571,16 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
-# CONFIG_SPD_CACHE_IN_FMAP is not set
+# end of Debugging
+
CONFIG_NO_CBFS_MCACHE=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/d945gclf/board.cfg b/resources/coreboot/d945gclf/board.cfg
index 10937423..b0513def 100644
--- a/resources/coreboot/d945gclf/board.cfg
+++ b/resources/coreboot/d945gclf/board.cfg
@@ -3,7 +3,5 @@ romtype="normal"
arch="x86_32"
payload_grub="n"
payload_grub_withseabios="n"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/d945gclf/config/libgfxinit_txtmode b/resources/coreboot/d945gclf/config/libgfxinit_txtmode
index 51f55c2f..3b7957ef 100644
--- a/resources/coreboot/d945gclf/config/libgfxinit_txtmode
+++ b/resources/coreboot/d945gclf/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -119,35 +118,28 @@ CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
CONFIG_POST_DEVICE=y
-# CONFIG_BOARD_EMULATION_QEMU_AARCH64 is not set
-# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
-# CONFIG_BOARD_EMULATION_QEMU_POWER8 is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
-# CONFIG_BOARD_EMULATION_QEMU_RISCV_RV64 is not set
-# CONFIG_BOARD_EMULATION_QEMU_RISCV_RV32 is not set
-# CONFIG_BOARD_EMULATION_SPIKE_RISCV is not set
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
-CONFIG_CBFS_MCACHE_SIZE=0x2000
# CONFIG_BOARD_INTEL_ADLRVP_P is not set
# CONFIG_BOARD_INTEL_ADLRVP_P_EXT_EC is not set
+# CONFIG_BOARD_INTEL_ADLRVP_P_MCHP is not set
# CONFIG_BOARD_INTEL_ADLRVP_M is not set
# CONFIG_BOARD_INTEL_ADLRVP_M_EXT_EC is not set
# CONFIG_BOARD_INTEL_APOLLOLAKE_RVP1 is not set
@@ -190,10 +182,7 @@ CONFIG_BOARD_INTEL_D945GCLF=y
# CONFIG_BOARD_INTEL_TGLRVP_UP3 is not set
# CONFIG_BOARD_INTEL_TGLRVP_UP4 is not set
# CONFIG_BOARD_INTEL_WTM2 is not set
-# CONFIG_ADL_CHROME_EC is not set
-# CONFIG_ADL_INTEL_EC is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="D945GCLF"
-# CONFIG_BOARD_INTEL_BASEBOARD_GLKRVP is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
@@ -223,11 +212,7 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
-# CONFIG_SYSTEM_TYPE_LAPTOP is not set
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
+# end of Mainboard
#
# Chipset
@@ -236,67 +221,43 @@ CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
+CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=32
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=3
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
CONFIG_INTEL_HAS_TOP_SWAP=y
# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set
CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_106CX=y
CONFIG_SOCKET_SPECIFIC_OPTIONS=y
CONFIG_SSE2=y
CONFIG_CPU_INTEL_SOCKET_441=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -304,35 +265,26 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_CPU_QEMU_X86_LAPIC_INIT is not set
-# CONFIG_CPU_QEMU_X86_PARALLEL_MP is not set
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
CONFIG_SERIALIZED_SMM_INITIALIZATION=y
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -341,42 +293,31 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_I945=y
CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC=y
-# CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM is not set
-# CONFIG_I945_LVDS is not set
-# CONFIG_OVERRIDE_CLOCK_DISABLE is not set
-# CONFIG_CHECK_SLFRCS_ON_RESUME is not set
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7=y
-# 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=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE is not set
CONFIG_INTEL_CHIPSET_LOCKDOWN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_WATCHDOG=y
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -386,27 +327,11 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_SMSC_LPC47M15X=y
#
# Embedded Controllers
#
-# CONFIG_EC_51NB_NPCE985LA0DX is not set
-# CONFIG_EC_GOOGLE_CHROMEEC_SKUID is not set
-# CONFIG_EC_GOOGLE_WILCO is not set
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -414,59 +339,43 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
CONFIG_SIPI_VECTOR_IN_ROM=y
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
-# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
# CONFIG_VGA_ROM_RUN is not set
-# CONFIG_RUN_FSP_GOP is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -476,32 +385,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -512,85 +407,24 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
-# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
-# CONFIG_INTEL_INT15 is not set
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# 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_IPMI_OCP 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_INTEL_GMA_OPREGION_2_0=y
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -599,32 +433,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -667,25 +504,18 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
CONFIG_HAVE_PIRQ_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
@@ -693,8 +523,8 @@ CONFIG_HAVE_PIRQ_TABLE=y
CONFIG_GENERATE_MP_TABLE=y
CONFIG_GENERATE_PIRQ_TABLE=y
CONFIG_GENERATE_SMBIOS_TABLES=y
-# CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -710,15 +540,8 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_YABITS is not set
# CONFIG_PAYLOAD_LINUX is not set
# CONFIG_PAYLOAD_TIANOCORE is not set
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
-# CONFIG_SEABIOS_REVISION is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_COMPRESSED_PAYLOAD_NONE is not set
-# CONFIG_COMPRESSED_PAYLOAD_LZMA is not set
-# CONFIG_COMPRESSED_PAYLOAD_LZ4 is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -728,6 +551,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -736,6 +561,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -753,25 +579,15 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
-# CONFIG_SPD_CACHE_IN_FMAP is not set
+# end of Debugging
+
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/d945gclf_16mb/board.cfg b/resources/coreboot/d945gclf_16mb/board.cfg
index c45a1650..21f58ada 100644
--- a/resources/coreboot/d945gclf_16mb/board.cfg
+++ b/resources/coreboot/d945gclf_16mb/board.cfg
@@ -3,7 +3,5 @@ romtype="normal"
arch="x86_32"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/d945gclf_16mb/config/libgfxinit_txtmode b/resources/coreboot/d945gclf_16mb/config/libgfxinit_txtmode
index 4fa5b0af..8cae6d14 100644
--- a/resources/coreboot/d945gclf_16mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/d945gclf_16mb/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -119,6 +118,8 @@ CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -128,18 +129,17 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
-CONFIG_CBFS_MCACHE_SIZE=0x2000
# CONFIG_BOARD_INTEL_ADLRVP_P is not set
# CONFIG_BOARD_INTEL_ADLRVP_P_EXT_EC is not set
+# CONFIG_BOARD_INTEL_ADLRVP_P_MCHP is not set
# CONFIG_BOARD_INTEL_ADLRVP_M is not set
# CONFIG_BOARD_INTEL_ADLRVP_M_EXT_EC is not set
# CONFIG_BOARD_INTEL_APOLLOLAKE_RVP1 is not set
@@ -183,7 +183,6 @@ CONFIG_BOARD_INTEL_D945GCLF=y
# CONFIG_BOARD_INTEL_TGLRVP_UP4 is not set
# CONFIG_BOARD_INTEL_WTM2 is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="D945GCLF"
-# CONFIG_BOARD_INTEL_BASEBOARD_GLKRVP is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
@@ -213,11 +212,7 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
-# CONFIG_SYSTEM_TYPE_LAPTOP is not set
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
+# end of Mainboard
#
# Chipset
@@ -226,67 +221,43 @@ CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
+CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=32
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=3
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
CONFIG_INTEL_HAS_TOP_SWAP=y
# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set
CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_106CX=y
CONFIG_SOCKET_SPECIFIC_OPTIONS=y
CONFIG_SSE2=y
CONFIG_CPU_INTEL_SOCKET_441=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -294,33 +265,26 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
CONFIG_SERIALIZED_SMM_INITIALIZATION=y
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -329,42 +293,31 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_I945=y
CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC=y
-# CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM is not set
-# CONFIG_I945_LVDS is not set
-# CONFIG_OVERRIDE_CLOCK_DISABLE is not set
-# CONFIG_CHECK_SLFRCS_ON_RESUME is not set
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7=y
-# 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=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE is not set
CONFIG_INTEL_CHIPSET_LOCKDOWN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_WATCHDOG=y
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -374,27 +327,11 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_SMSC_LPC47M15X=y
#
# Embedded Controllers
#
-# CONFIG_EC_51NB_NPCE985LA0DX is not set
-# CONFIG_EC_GOOGLE_CHROMEEC_SKUID is not set
-# CONFIG_EC_GOOGLE_WILCO is not set
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -402,58 +339,43 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
CONFIG_SIPI_VECTOR_IN_ROM=y
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
-# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -463,32 +385,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -499,85 +407,24 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
-# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
-# CONFIG_INTEL_INT15 is not set
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# 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_IPMI_OCP 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_INTEL_GMA_OPREGION_2_0=y
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -586,32 +433,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -654,25 +504,18 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
CONFIG_HAVE_PIRQ_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
@@ -680,8 +523,8 @@ CONFIG_HAVE_PIRQ_TABLE=y
CONFIG_GENERATE_MP_TABLE=y
CONFIG_GENERATE_PIRQ_TABLE=y
CONFIG_GENERATE_SMBIOS_TABLES=y
-# CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -699,7 +542,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -709,6 +551,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -717,6 +561,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -734,25 +579,15 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
-# CONFIG_SPD_CACHE_IN_FMAP is not set
+# end of Debugging
+
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/default/board.cfg b/resources/coreboot/default/board.cfg
index cad210cd..398bcebd 100644
--- a/resources/coreboot/default/board.cfg
+++ b/resources/coreboot/default/board.cfg
@@ -1,33 +1,4 @@
cbtree="default"
romtype="normal"
-cbrevision="a0aee78c8261804e498b3c31bf4b855fb7e7d1cd"
+cbrevision="b2e8bd83647f664260120fdfc7d07cba694dd89e"
arch="x86_64"
-payload_grub="n"
-payload_grub_withseabios="n"
-payload_grub_withtianocore="n"
-payload_seabios="n"
-payload_tianocore="n"
-payload_memtest="n"
-
-# NOTE: 1b242b6618d4cbb80d5b4268ba2b39ae363d96f9 is the last revision checked.
-# Right now, coreboot 4.14 is being used, and specific patches being
-# Backported. Check commits after the above commit ID
-
-# NOTE: for de-blob purposes, 4.14 was used. next time deblobbing, compare
-# files between 4.14 and whatever new version of coreboot is used
-
-# The following patches from coreboot are currently backported to 4.14:
-# 99973d29af774c54e8859d967b2b9617abebeeb0 <-- and this is the last one
-# 40b8f01697d6f26f86de7fbda1d0a160dcd4d5df
-# 5c3b05ecf4dbb89da3dd7bc514875b53e3a8ce1c
-# f963a0f8e5ac5d68b17bb1f703cab617260a3fa6
-# 0afb90a73ba007b3f6dc135ec8105def00182c5f
-# de0fd07ca7f5ca404d1a13c036766c561fd26cd8
-# 6318f1f500b69bbba156ec78598406cf30fd5e02 <-- then this, going all the way up
-# b403da65cddff557da67cabd1a66e1053b8967c7 <-- then this
-# 9a056013411a79ca7973c6a141d78e22949d4553 <-- this first
-
-# Watch this. It may cause some mayhem:
-# https://review.coreboot.org/c/coreboot/+/54301
-# https://review.coreboot.org/c/coreboot/+/54298
-# keep an eye on avph's changes to postcar stage (on various platforms)
diff --git a/resources/coreboot/default/deblob-check.results.list b/resources/coreboot/default/deblob-check.results.list
deleted file mode 100644
index 5f18d3c8..00000000
--- a/resources/coreboot/default/deblob-check.results.list
+++ /dev/null
@@ -1,849 +0,0 @@
-./3rdparty/arm-trusted-firmware/docs/components/secure-partition-manager.rst
-./3rdparty/arm-trusted-firmware/docs/design/firmware-design.rst
-./3rdparty/arm-trusted-firmware/docs/plat/arm/fvp/index.rst
-./3rdparty/arm-trusted-firmware/drivers/marvell/comphy/phy-comphy-3700.c
-./3rdparty/arm-trusted-firmware/drivers/renesas/rcar/ddr/ddr_b/boot_init_dram_config.c
-./3rdparty/arm-trusted-firmware/drivers/st/pmic/stpmic1.c
-./3rdparty/arm-trusted-firmware/lib/debugfs/blobs.h
-./3rdparty/arm-trusted-firmware/lib/debugfs/devfip.c
-./3rdparty/arm-trusted-firmware/lib/romlib/gen_combined_bl1_romlib.sh
-./3rdparty/arm-trusted-firmware/lib/zlib/crc32.h
-./3rdparty/arm-trusted-firmware/lib/zlib/inffixed.h
-./3rdparty/arm-trusted-firmware/lib/zlib/inftrees.c
-./3rdparty/arm-trusted-firmware/plat/arm/board/fvp/fvp_io_storage.c
-./3rdparty/arm-trusted-firmware/plat/arm/board/rde1edge/rde1edge_topology.c
-./3rdparty/arm-trusted-firmware/plat/common/plat_bl_common.c
-./3rdparty/arm-trusted-firmware/plat/hisilicon/hikey/hisi_dvfs.c
-./3rdparty/arm-trusted-firmware/plat/hisilicon/poplar/include/platform_def.h
-./3rdparty/arm-trusted-firmware/plat/hisilicon/poplar/include/poplar_layout.h
-./3rdparty/arm-trusted-firmware/plat/intel/soc/agilex/soc/agilex_pinmux.c
-./3rdparty/arm-trusted-firmware/plat/intel/soc/stratix10/soc/s10_pinmux.c
-./3rdparty/arm-trusted-firmware/plat/marvell/armada/a8k/a70x0/board/dram_port.c
-./3rdparty/arm-trusted-firmware/plat/marvell/armada/a8k/a70x0_amc/board/dram_port.c
-./3rdparty/arm-trusted-firmware/plat/marvell/armada/a8k/a80x0/board/dram_port.c
-./3rdparty/arm-trusted-firmware/plat/marvell/armada/a8k/a80x0_mcbin/board/dram_port.c
-./3rdparty/arm-trusted-firmware/plat/marvell/armada/a8k/a80x0_puzzle/board/dram_port.c
-./3rdparty/arm-trusted-firmware/plat/marvell/octeontx/otx2/t91/t9130/board/dram_port.c
-./3rdparty/arm-trusted-firmware/plat/mediatek/mt8173/drivers/spm/spm_hotplug.c
-./3rdparty/arm-trusted-firmware/plat/mediatek/mt8173/drivers/spm/spm_mcdi.c
-./3rdparty/arm-trusted-firmware/plat/mediatek/mt8173/drivers/spm/spm_suspend.c
-./3rdparty/arm-trusted-firmware/plat/qemu/common/qemu_io_storage.c
-./3rdparty/arm-trusted-firmware/plat/rockchip/rk3368/drivers/ddr/ddr_rk3368.c
-./3rdparty/arm-trusted-firmware/plat/rockchip/rk3368/drivers/ddr/rk3368_ddr_reg_resume_V1.05.bin
-./3rdparty/arm-trusted-firmware/plat/rockchip/rk3399/drivers/dram/dfs.c
-./3rdparty/arm-trusted-firmware/plat/rockchip/rk3399/drivers/m0/src/startup.c
-./3rdparty/arm-trusted-firmware/plat/rpi/common/rpi3_io_storage.c
-./3rdparty/arm-trusted-firmware/plat/socionext/synquacer/sq_spm.c
-./3rdparty/arm-trusted-firmware/plat/st/stm32mp1/platform.mk
-./3rdparty/arm-trusted-firmware/tools/amlogic/doimage.c
-./3rdparty/arm-trusted-firmware/tools/fiptool/fiptool.c
-./3rdparty/arm-trusted-firmware/tools/sptool/sp_mk_generator.py
-./3rdparty/chromeec/board/bloog/board.c
-./3rdparty/chromeec/board/coffeecake/board.c
-./3rdparty/chromeec/board/cr50/tpm2/ecc.c
-./3rdparty/chromeec/board/cr50/tpm2/endorsement.c
-./3rdparty/chromeec/board/cr50/tpm2/rsa.c
-./3rdparty/chromeec/board/dingdong/board.c
-./3rdparty/chromeec/board/flapjack/battery.c
-./3rdparty/chromeec/board/hoho/board.c
-./3rdparty/chromeec/board/kukui_scp/update_scp
-./3rdparty/chromeec/board/meep/board.c
-./3rdparty/chromeec/chip/g/dcrypto/bn.c
-./3rdparty/chromeec/chip/g/dcrypto/hmac_drbg.c
-./3rdparty/chromeec/chip/mchp/util/pack_ec.py
-./3rdparty/chromeec/chip/mec1322/util/pack_ec.py
-./3rdparty/chromeec/chip/stm32/usb_hid_keyboard.c
-./3rdparty/chromeec/chip/stm32/usb_hid_touchpad.c
-./3rdparty/chromeec/common/crc.c
-./3rdparty/chromeec/common/ctz.c
-./3rdparty/chromeec/common/keyboard_8042_sharedlib.c
-./3rdparty/chromeec/common/lightbar.c
-./3rdparty/chromeec/common/mock/rollback_mock.c
-./3rdparty/chromeec/common/sha256.c
-./3rdparty/chromeec/core/riscv-rv32i/init.S
-./3rdparty/chromeec/driver/als_tcs3400.c
-./3rdparty/chromeec/driver/led/lm3509.c
-./3rdparty/chromeec/driver/regulator_ir357x.c
-./3rdparty/chromeec/driver/touchpad_elan.c
-./3rdparty/chromeec/extra/rma_reset/rma_reset.c
-./3rdparty/chromeec/extra/touchpad_updater/touchpad_updater.c
-./3rdparty/chromeec/extra/usb_updater/fw_update.py
-./3rdparty/chromeec/extra/usb_updater/servo_updater.py
-./3rdparty/chromeec/fuzz/nvmem_tpm2_mock.c
-./3rdparty/chromeec/setup.py
-./3rdparty/chromeec/test/aes.c
-./3rdparty/chromeec/test/fpsensor.c
-./3rdparty/chromeec/test/legacy_nvmem_dump.h
-./3rdparty/chromeec/test/nvmem_tpm2_mock.c
-./3rdparty/chromeec/test/pinweaver.c
-./3rdparty/chromeec/test/rsa2048-3.h
-./3rdparty/chromeec/test/rsa2048-F4.h
-./3rdparty/chromeec/test/sha256.c
-./3rdparty/chromeec/test/test_config.h
-./3rdparty/chromeec/test/thermal.c
-./3rdparty/chromeec/test/tpm_test/rsa_test.py
-./3rdparty/chromeec/test/usb_prl.c
-./3rdparty/chromeec/test/x25519.c
-./3rdparty/chromeec/third_party/boringssl/common/aes.c
-./3rdparty/chromeec/third_party/boringssl/core/cortex-m/aes.S
-./3rdparty/chromeec/util/ec_sb_firmware_update.c
-./3rdparty/chromeec/util/ectool_keyscan.c
-./3rdparty/chromeec/util/flash_ec
-./3rdparty/chromeec/util/flash_fp_mcu
-./3rdparty/chromeec/util/flash_pd.py
-./3rdparty/chromeec/util/signer/create_released_image.sh
-./3rdparty/chromeec/util/uut/lib_crc.c
-./3rdparty/intel-sec-tools/cmd/txt-prov/README.md
-./3rdparty/intel-sec-tools/pkg/hwapi/mock_pc.go
-./3rdparty/intel-sec-tools/pkg/provisioning/structures.go
-./3rdparty/intel-sec-tools/pkg/test/tpm.go
-./3rdparty/intel-sec-tools/pkg/tools/acm_test.go
-./3rdparty/intel-sec-tools/pkg/tools/lcp_test.go
-./3rdparty/libgfxinit/common/skylake/hw-gfx-gma-plls-dpll.adb
-./3rdparty/opensbi/Makefile
-./3rdparty/stm/Stm/StmPkg/Core/CMakeLists.txt
-./3rdparty/stm/Stm/StmPkg/EdkII/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py
-./3rdparty/stm/Stm/StmPkg/EdkII/BaseTools/Source/Python/Common/VpdInfoFile.py
-./3rdparty/vboot/cgpt/cgpt_wrapper.c
-./3rdparty/vboot/firmware/2lib/2sha256.c
-./3rdparty/vboot/firmware/2lib/2sha512.c
-./3rdparty/vboot/firmware/lib/cgptlib/crc32.c
-./3rdparty/vboot/firmware/lib/tpm_lite/include/tlcl_structures.h
-./3rdparty/vboot/futility/cmd_gbb_utility.c
-./3rdparty/vboot/futility/file_type_rwsig.c
-./3rdparty/vboot/futility/updater.c
-./3rdparty/vboot/futility/updater_archive.c
-./3rdparty/vboot/scripts/image_signing/make_dev_firmware.sh
-./3rdparty/vboot/scripts/image_signing/make_dev_ssd.sh
-./3rdparty/vboot/scripts/image_signing/sign_android_image.sh
-./3rdparty/vboot/scripts/image_signing/sign_cr50_firmware.sh
-./3rdparty/vboot/scripts/image_signing/sign_official_build.sh
-./3rdparty/vboot/scripts/image_signing/strip_boot_from_image.sh
-./3rdparty/vboot/scripts/image_signing/tag_image.sh
-./3rdparty/vboot/tests/cgptlib_test.c
-./3rdparty/vboot/tests/crc32_test.c
-./3rdparty/vboot/tests/futility/data/bios_link_mp.bin
-./3rdparty/vboot/tests/futility/data/bios_peppy_mp.bin
-./3rdparty/vboot/tests/futility/link_bios.manifest.json
-./3rdparty/vboot/tests/futility/link_image.manifest.json
-./3rdparty/vboot/tests/futility/models/link/setvars.sh
-./3rdparty/vboot/tests/futility/models/peppy/setvars.sh
-./3rdparty/vboot/tests/futility/models/whitetip/setvars.sh
-./3rdparty/vboot/tests/futility/test_dump_fmap.sh
-./3rdparty/vboot/tests/futility/test_file_types.c
-./3rdparty/vboot/tests/futility/test_file_types.sh
-./3rdparty/vboot/tests/futility/test_rwsig.sh
-./3rdparty/vboot/tests/futility/test_sign_firmware.sh
-./3rdparty/vboot/tests/futility/test_update.sh
-./3rdparty/vboot/tests/gen_preamble_testdata.sh
-./3rdparty/vboot/tests/load_kernel_tests.sh
-./3rdparty/vboot/tests/rsa_padding_test.h
-./3rdparty/vboot/tests/run_vbutil_kernel_arg_tests.sh
-./3rdparty/vboot/tests/sha_test_vectors.h
-./3rdparty/vboot/tests/testcases/padding_test_vectors.inc
-./3rdparty/vboot/tests/tlcl_tests.c
-./3rdparty/vboot/tests/vb21_host_misc_tests.c
-./3rdparty/vboot/tests/vb2_api_tests.c
-./3rdparty/vboot/tests/vb2_sha_tests.c
-./3rdparty/vboot/utility/chromeos-tpm-recovery
-./3rdparty/vboot/utility/vbutil_what_keys
-./Documentation/Intel/SoC/soc.html
-./Documentation/releases/coreboot-4.13-relnotes.md
-./Documentation/releases/coreboot-4.2-relnotes.md
-./Documentation/soc/intel/fit.md
-./Documentation/soc/intel/index.md
-./Documentation/soc/intel/microcode.md
-./Documentation/tutorial/part1.md
-./Documentation/codeflow.svg
-./Documentation/hypertransport.svg
-./configs/builder/config.intel.cpx.crb
-./configs/builder/config.lenovo_t420
-./configs/builder/config.lenovo_t420s
-./configs/builder/config.lenovo_t430s
-./configs/builder/config.lenovo_t520
-./configs/builder/config.lenovo_t530
-./configs/builder/config.lenovo_x220
-./configs/builder/config.lenovo_x220i
-./configs/builder/config.lenovo_x230
-./configs/builder/config.ocp.deltalake
-./configs/builder/config.ocp.tiogapass
-./configs/config.asrock_b85m_pro4.tpm2_txt_placeholder_acms
-./configs/config.intel_coffeelake_rvp11.fsp_car
-./configs/config.purism_librem15_v4.txt_build_test
-./payloads/external/BOOTBOOT/Kconfig
-./payloads/external/FILO/Kconfig
-./payloads/external/GRUB2/Kconfig
-./payloads/external/SeaBIOS/Kconfig
-./payloads/external/U-Boot/Kconfig
-./payloads/external/Yabits/Kconfig
-./payloads/external/depthcharge/Kconfig
-./payloads/libpayload/curses/PDCurses/demos/worm.c
-./payloads/libpayload/curses/PDCurses/sdl1/deffont.h
-./payloads/libpayload/curses/PDCurses/sdl1/deficon.h
-./payloads/libpayload/curses/PDCurses/win32/pdckbd.c
-./payloads/libpayload/curses/PDCurses/x11/big_icon.xbm
-./payloads/libpayload/curses/PDCurses/x11/little_icon.xbm
-./payloads/libpayload/curses/pdcurses-backend/pdcdisp.c
-./payloads/libpayload/curses/tinycurses.c
-./payloads/libpayload/drivers/i8042/keyboard.c
-./payloads/libpayload/drivers/usb/usbmsc.c
-./payloads/libpayload/libc/fpmath.c
-./payloads/libpayload/tests/cbfs-x86-test.c
-./payloads/nvramcui/payload.sh
-./payloads/Kconfig
-./src/cpu/amd/pi/00730F01/Makefile.inc
-./src/cpu/amd/pi/00730F01/model_16_init.c
-./src/cpu/amd/pi/00730F01/update_microcode.c
-./src/cpu/intel/car/non-evict/cache_as_ram.S
-./src/cpu/intel/car/p4-netburst/cache_as_ram.S
-./src/cpu/intel/haswell/acpi.c
-./src/cpu/intel/microcode/Kconfig
-./src/cpu/intel/microcode/microcode.c
-./src/cpu/intel/microcode/microcode_asm.S
-./src/cpu/intel/model_2065x/acpi.c
-./src/cpu/intel/model_206ax/acpi.c
-./src/cpu/intel/model_65x/model_65x_init.c
-./src/cpu/intel/model_67x/model_67x_init.c
-./src/cpu/intel/model_68x/model_68x_init.c
-./src/cpu/intel/model_6bx/model_6bx_init.c
-./src/cpu/intel/model_6xx/model_6xx_init.c
-./src/cpu/intel/model_f2x/model_f2x_init.c
-./src/cpu/intel/model_f3x/model_f3x_init.c
-./src/cpu/Kconfig
-./src/cpu/Makefile.inc
-./src/device/oprom/yabel/interrupt.c
-./src/device/Kconfig
-./src/drivers/aspeed/common/ast_dram_tables.h
-./src/drivers/aspeed/common/ast_tables.h
-./src/drivers/i2c/ww_ring/ww_ring_programs.c
-./src/drivers/intel/fsp1_1/cache_as_ram.S
-./src/drivers/intel/fsp1_1/car.c
-./src/drivers/intel/fsp1_1/ramstage.c
-./src/drivers/intel/fsp1_1/romstage.c
-./src/drivers/intel/fsp1_1/temp_ram_exit.c
-./src/drivers/intel/fsp2_0/Kconfig
-./src/drivers/intel/gma/opregion.c
-./src/drivers/intel/gma/opregion.h
-./src/drivers/pc80/rtc/option.c
-./src/drivers/pc80/vga/vga_palette.c
-./src/drivers/siemens/nc_fpga/nc_fpga.c
-./src/drivers/wifi/generic/Kconfig
-./src/ec/51nb/npce985la0dx/Kconfig
-./src/ec/hp/kbc1126/Kconfig
-./src/include/cpu/amd/microcode.h
-./src/include/cpu/intel/microcode.h
-./src/include/spd_bin.h
-./src/lib/coreboot_table.c
-./src/lib/jpeg.c
-./src/lib/spd_bin.c
-./src/mainboard/amd/gardenia/bootblock/OemCustomize.c
-./src/mainboard/amd/inagua/Kconfig
-./src/mainboard/amd/majolica/Kconfig
-./src/mainboard/amd/mandolin/Kconfig
-./src/mainboard/amd/olivehill/mptable.c
-./src/mainboard/amd/parmer/mptable.c
-./src/mainboard/amd/persimmon/Kconfig
-./src/mainboard/amd/south_station/Kconfig
-./src/mainboard/amd/south_station/mptable.c
-./src/mainboard/amd/thatcher/mptable.c
-./src/mainboard/amd/union_station/Kconfig
-./src/mainboard/amd/union_station/mptable.c
-./src/mainboard/apple/macbookair4_2/early_init.c
-./src/mainboard/asrock/b75pro3-m/early_init.c
-./src/mainboard/asrock/e350m1/mptable.c
-./src/mainboard/asrock/imb-a180/mptable.c
-./src/mainboard/asus/a88xm-e/mainboard.c
-./src/mainboard/asus/f2a85-m/mptable.c
-./src/mainboard/asus/h61m-cs/early_init.c
-./src/mainboard/asus/maximus_iv_gene-z/early_init.c
-./src/mainboard/asus/p8h61-m_lx/early_init.c
-./src/mainboard/asus/p8h61-m_lx3_r2_0/early_init.c
-./src/mainboard/asus/p8h61-m_pro/early_init.c
-./src/mainboard/asus/p8z77-v_lx2/early_init.c
-./src/mainboard/bap/ode_e20XX/spd/BAP_Q7_1066.spd.hex
-./src/mainboard/bap/ode_e20XX/spd/BAP_Q7_800.spd.hex
-./src/mainboard/biostar/a68n_5200/mptable.c
-./src/mainboard/biostar/th61-itx/early_init.c
-./src/mainboard/clevo/cml-u/spd/samsung-K4AAG165WA-BCTD.spd.hex
-./src/mainboard/compulab/intense_pc/early_init.c
-./src/mainboard/dell/optiplex_9010/early_init.c
-./src/mainboard/dell/optiplex_9010/sch5545_ec.c
-./src/mainboard/dell/optiplex_9010/sch5545_ec_early.c
-./src/mainboard/facebook/fbg1701/spd/KINGSTON_B5116ECMDXGGB.spd.hex
-./src/mainboard/facebook/fbg1701/spd/MICRON_MT41K512M16HA-125A.spd.hex
-./src/mainboard/facebook/fbg1701/spd/SAMSUNG_K4B8G1646D-MYKO.spd.hex
-./src/mainboard/facebook/fbg1701/Kconfig
-./src/mainboard/facebook/fbg1701/board_mboot.h
-./src/mainboard/facebook/fbg1701/board_verified_boot.c
-./src/mainboard/facebook/fbg1701/board_verified_boot.h
-./src/mainboard/facebook/fbg1701/ramstage.c
-./src/mainboard/facebook/monolith/Kconfig
-./src/mainboard/gigabyte/ga-b75m-d3h/early_init.c
-./src/mainboard/gigabyte/ga-h61m-series/early_init.c
-./src/mainboard/gizmosphere/gizmo/mptable.c
-./src/mainboard/gizmosphere/gizmo2/spd/Micron_MT41J128M16JT.spd.hex
-./src/mainboard/google/auron/variants/auron_paine/spd/Hynix_HMT425S6AFR6A.spd.hex
-./src/mainboard/google/auron/variants/auron_paine/spd/Hynix_HMT425S6CFR6A_H5TC4G63CFR.spd.hex
-./src/mainboard/google/auron/variants/auron_paine/spd/Micron_4KTF25664HZ.spd.hex
-./src/mainboard/google/auron/variants/auron_paine/spd/empty.spd.hex
-./src/mainboard/google/auron/variants/auron_paine/spd/spd.c
-./src/mainboard/google/auron/variants/auron_yuna/spd/Hynix_HMT425S6AFR6A.spd.hex
-./src/mainboard/google/auron/variants/auron_yuna/spd/Hynix_HMT425S6CFR6A_H5TC4G63CFR.spd.hex
-./src/mainboard/google/auron/variants/auron_yuna/spd/Micron_4KTF25664HZ.spd.hex
-./src/mainboard/google/auron/variants/auron_yuna/spd/empty.spd.hex
-./src/mainboard/google/auron/variants/auron_yuna/spd/spd.c
-./src/mainboard/google/auron/variants/buddy/variant.c
-./src/mainboard/google/auron/variants/gandof/spd/Hynix_HMT425S6AFR6A.spd.hex
-./src/mainboard/google/auron/variants/gandof/spd/Hynix_HMT425S6CFR6A_H5TC4G63CFR.spd.hex
-./src/mainboard/google/auron/variants/gandof/spd/Micron_4KTF25664HZ.spd.hex
-./src/mainboard/google/auron/variants/gandof/spd/Samsung_M471B5674EB0-YK0.spd.hex
-./src/mainboard/google/auron/variants/gandof/spd/empty.spd.hex
-./src/mainboard/google/auron/variants/gandof/spd/spd.c
-./src/mainboard/google/auron/variants/lulu/spd/empty.spd.hex
-./src/mainboard/google/auron/variants/lulu/spd/hynix_2GiB_dimm_H5TC4G63AFR-PBA.spd.hex
-./src/mainboard/google/auron/variants/lulu/spd/hynix_4GiB_dimm_H5TC8G63CMR-PBA.spd.hex
-./src/mainboard/google/auron/variants/lulu/spd/micron_2GiB_dimm_MT41K256M16HA-125.spd.hex
-./src/mainboard/google/auron/variants/lulu/spd/micron_4GiB_dimm_MT41K512M16TNA-125.spd.hex
-./src/mainboard/google/auron/variants/lulu/spd/samsung_2GiB_dimm_K4B4G1646E-BYK0.spd.hex
-./src/mainboard/google/auron/variants/lulu/spd/samsung_2GiB_dimm_K4B4G1646Q-HYK0.spd.hex
-./src/mainboard/google/auron/variants/lulu/spd/samsung_4GiB_dimm_K4B8G1646Q-MYK0.spd.hex
-./src/mainboard/google/auron/variants/lulu/spd/spd.c
-./src/mainboard/google/auron/variants/samus/spd/elpida_16.spd.hex
-./src/mainboard/google/auron/variants/samus/spd/elpida_4.spd.hex
-./src/mainboard/google/auron/variants/samus/spd/elpida_8.spd.hex
-./src/mainboard/google/auron/variants/samus/spd/empty.spd.hex
-./src/mainboard/google/auron/variants/samus/spd/hynix_16.spd.hex
-./src/mainboard/google/auron/variants/samus/spd/hynix_4.spd.hex
-./src/mainboard/google/auron/variants/samus/spd/hynix_8.spd.hex
-./src/mainboard/google/auron/variants/samus/spd/samsung_4.spd.hex
-./src/mainboard/google/auron/variants/samus/spd/samsung_8.spd.hex
-./src/mainboard/google/auron/variants/samus/spd/spd.c
-./src/mainboard/google/beltino/lan.c
-./src/mainboard/google/butterfly/hda_verb.c
-./src/mainboard/google/butterfly/mainboard.c
-./src/mainboard/google/cyan/spd/empty.spd.hex
-./src/mainboard/google/cyan/spd/hynix_2GiB_dimm_H5TC4G63AFR-PBA.spd.hex
-./src/mainboard/google/cyan/spd/hynix_2GiB_dimm_H9CCNNN8GTMLAR-NUD.spd.hex
-./src/mainboard/google/cyan/spd/hynix_2GiB_dimm_HMT425S6CFR6A_H5TC4G63CFR.spd.hex
-./src/mainboard/google/cyan/spd/hynix_dimm_H9CCNNN8GTALAR-NUD.spd.hex
-./src/mainboard/google/cyan/spd/hynix_dimm_H9CCNNN8GTMLAR-NUD.spd.hex
-./src/mainboard/google/cyan/spd/hynix_dimm_H9CCNNN8JTBLAR-NUD-1G-1866.spd.hex
-./src/mainboard/google/cyan/spd/hynix_dimm_H9CCNNN8JTBLAR-NUD.spd.hex
-./src/mainboard/google/cyan/spd/micron_2GiB_dimm_EDF8132A3MA-GD-F-R.spd.hex
-./src/mainboard/google/cyan/spd/micron_2GiB_dimm_EDF8132A3MA-JD-F.spd.hex
-./src/mainboard/google/cyan/spd/micron_2GiB_dimm_MT41K256M16TW-107.spd.hex
-./src/mainboard/google/cyan/spd/micron_2GiB_dimm_MT52L256M32D1PF-107WT.spd.hex
-./src/mainboard/google/cyan/spd/micron_2GiB_dimm_MT52L256M32D1PF.spd.hex
-./src/mainboard/google/cyan/spd/micron_dimm_MT52L256M32D1PF-107.spd.hex
-./src/mainboard/google/cyan/spd/nanya_dimm_NT6CL256T32CM-H1.spd.hex
-./src/mainboard/google/cyan/spd/samsung_2GiB_dimm_K4B4G1646E-BYK0.spd.hex
-./src/mainboard/google/cyan/spd/samsung_2GiB_dimm_K4B4G1646Q-HYK0.spd.hex
-./src/mainboard/google/cyan/spd/samsung_2GiB_dimm_K4E8E304EE-EGCE.spd.hex
-./src/mainboard/google/cyan/spd/samsung_2GiB_dimm_K4E8E304EE-EGCF.spd.hex
-./src/mainboard/google/cyan/spd/samsung_2GiB_dimm_K4E8E324EB-EGCF.spd.hex
-./src/mainboard/google/cyan/spd/samsung_dimm_K4E8E304EE-EGCE.spd.hex
-./src/mainboard/google/cyan/spd/samsung_dimm_K4E8E304EE-EGCF.spd.hex
-./src/mainboard/google/cyan/spd/samsung_dimm_K4E8E324EB-EGCF.spd.hex
-./src/mainboard/google/cyan/spd/spd.c
-./src/mainboard/google/dedede/variants/drawcia/variant.c
-./src/mainboard/google/dedede/variants/madoo/variant.c
-./src/mainboard/google/dedede/variants/magolor/variant.c
-./src/mainboard/google/drallion/spd/empty_ddr4.spd.hex
-./src/mainboard/google/drallion/spd/hynix_dimm_H5AN8G6NCJR-VKC.spd.hex
-./src/mainboard/google/drallion/spd/hynix_dimm_H5AN8G6NDJR-XNC.spd.hex
-./src/mainboard/google/drallion/spd/hynix_dimm_H5ANAG6NCMR-VKC.spd.hex
-./src/mainboard/google/drallion/spd/micron_dimm_MT40A1G16KD-062EE.spd.hex
-./src/mainboard/google/drallion/spd/micron_dimm_MT40A1G16KNR-075E.spd.hex
-./src/mainboard/google/drallion/spd/micron_dimm_MT40A512M16LY-075E.spd.hex
-./src/mainboard/google/drallion/spd/micron_dimm_MT40A512M16TB-062EJ.spd.hex
-./src/mainboard/google/drallion/spd/samsung_dimm_K4A8G165WC-BCTD.spd.hex
-./src/mainboard/google/drallion/spd/samsung_dimm_K4A8G165WC-BCWE.spd.hex
-./src/mainboard/google/drallion/spd/samsung_dimm_K4AAG165WA-BCWE.spd.hex
-./src/mainboard/google/drallion/spd/samsung_dimm_K4AAG165WB-MCTD.spd.hex
-./src/mainboard/google/drallion/variants/drallion/devicetree.cb
-./src/mainboard/google/drallion/variants/drallion/memory.c
-./src/mainboard/google/eve/spd/empty.spd.hex
-./src/mainboard/google/eve/spd/hynix_dimm_H9CCNNN8GTALAR.spd.hex
-./src/mainboard/google/eve/spd/hynix_dimm_H9CCNNNBJTALAR.spd.hex
-./src/mainboard/google/eve/spd/hynix_dimm_H9CCNNNCLTMLAR.spd.hex
-./src/mainboard/google/eve/spd/samsung_dimm_K4E6E304EB.spd.hex
-./src/mainboard/google/eve/spd/samsung_dimm_K4E8E324EB.spd.hex
-./src/mainboard/google/eve/spd/samsung_dimm_K4EBE304EB.spd.hex
-./src/mainboard/google/eve/spd/spd.c
-./src/mainboard/google/glados/spd/empty.spd.hex
-./src/mainboard/google/glados/spd/hynix_dimm_H9CCNNN8GTALAR.spd.hex
-./src/mainboard/google/glados/spd/hynix_dimm_H9CCNNN8GTMLAR-NUD.spd.hex
-./src/mainboard/google/glados/spd/hynix_dimm_H9CCNNN8GTMLAR.spd.hex
-./src/mainboard/google/glados/spd/hynix_dimm_H9CCNNN8JTBLAR-NUD-1G-1866.spd.hex
-./src/mainboard/google/glados/spd/hynix_dimm_H9CCNNN8JTBLAR.spd.hex
-./src/mainboard/google/glados/spd/hynix_dimm_H9CCNNNBJTALAR.spd.hex
-./src/mainboard/google/glados/spd/hynix_dimm_H9CCNNNBJTMLAR-NUD.spd.hex
-./src/mainboard/google/glados/spd/hynix_dimm_H9CCNNNBJTMLAR.spd.hex
-./src/mainboard/google/glados/spd/hynix_dimm_H9CCNNNBLTALAR.spd.hex
-./src/mainboard/google/glados/spd/hynix_dimm_H9CCNNNBLTBLAR-NUD-2G-1866.spd.hex
-./src/mainboard/google/glados/spd/hynix_dimm_H9CCNNNCLGALAR.spd.hex
-./src/mainboard/google/glados/spd/hynix_dimm_H9CCNNNCLTMLAR.spd.hex
-./src/mainboard/google/glados/spd/micron_16GiB_dimm_MT52L1G32D4PG.spd.hex
-./src/mainboard/google/glados/spd/micron_4GiB_dimm_MT52L256M32D1PF.spd.hex
-./src/mainboard/google/glados/spd/micron_8GiB_dimm_MT52L512M32D2PF.spd.hex
-./src/mainboard/google/glados/spd/micron_dimm_MT52L256M32D1PF-107-1G-1866.spd.hex
-./src/mainboard/google/glados/spd/micron_dimm_MT52L512M32D2PF-107-2G-1866.spd.hex
-./src/mainboard/google/glados/spd/samsung_dimm_K4E6E304EB-EGCF-2G-1866.spd.hex
-./src/mainboard/google/glados/spd/samsung_dimm_K4E6E304EB-EGCF.spd.hex
-./src/mainboard/google/glados/spd/samsung_dimm_K4E6E304EE-EGCF.spd.hex
-./src/mainboard/google/glados/spd/samsung_dimm_K4E8E304EE-EGCE.spd.hex
-./src/mainboard/google/glados/spd/samsung_dimm_K4E8E304EE-EGCF.spd.hex
-./src/mainboard/google/glados/spd/samsung_dimm_K4E8E324EB-EGCF-1G-1866.spd.hex
-./src/mainboard/google/glados/spd/samsung_dimm_K4E8E324EB-EGCF.spd.hex
-./src/mainboard/google/glados/spd/samsung_dimm_K4EBE304EB-EGCF.spd.hex
-./src/mainboard/google/glados/spd/samsung_dimm_K4EBE304EB-EGCG.spd.hex
-./src/mainboard/google/glados/spd/spd.c
-./src/mainboard/google/hatch/spd/16G_2400.spd.hex
-./src/mainboard/google/hatch/spd/16G_2666.spd.hex
-./src/mainboard/google/hatch/spd/16G_2666_2bg.spd.hex
-./src/mainboard/google/hatch/spd/16G_3200.spd.hex
-./src/mainboard/google/hatch/spd/16G_3200_4bg.spd.hex
-./src/mainboard/google/hatch/spd/4G_2400.spd.hex
-./src/mainboard/google/hatch/spd/8G_2400.spd.hex
-./src/mainboard/google/hatch/spd/8G_2666.spd.hex
-./src/mainboard/google/hatch/spd/8G_3200.spd.hex
-./src/mainboard/google/hatch/spd/LP_16G_2133.spd.hex
-./src/mainboard/google/hatch/spd/LP_4G_2133.spd.hex
-./src/mainboard/google/hatch/spd/LP_8G_2133.spd.hex
-./src/mainboard/google/hatch/spd/empty_ddr4.spd.hex
-./src/mainboard/google/hatch/variants/dratini/variant.c
-./src/mainboard/google/hatch/variants/kindred/variant.c
-./src/mainboard/google/hatch/variants/nightfury/variant.c
-./src/mainboard/google/jecht/lan.c
-./src/mainboard/google/kahlee/spd/empty.spd.hex
-./src/mainboard/google/kahlee/spd/hynix-H5AN8G6NAFR-UH.spd.hex
-./src/mainboard/google/kahlee/spd/hynix-H5AN8G6NCJR-VKC.spd.hex
-./src/mainboard/google/kahlee/spd/hynix-H5AN8G6NCJR-XNC.spd.hex
-./src/mainboard/google/kahlee/spd/hynix-H5ANAG6NAMR-UH.spd.hex
-./src/mainboard/google/kahlee/spd/hynix-H5ANAG6NCMR-VKC.spd.hex
-./src/mainboard/google/kahlee/spd/hynix-H5ANAG6NCMR-XNC.spd.hex
-./src/mainboard/google/kahlee/spd/micron-MT40A1G16KNR-075-E.spd.hex
-./src/mainboard/google/kahlee/spd/micron-MT40A1G16RC-062E-B.spd.hex
-./src/mainboard/google/kahlee/spd/micron-MT40A512M16JY-083E-B.spd.hex
-./src/mainboard/google/kahlee/spd/micron-MT40A512M16LY-075-E.spd.hex
-./src/mainboard/google/kahlee/spd/micron-MT40A512M16TB-062E-J.spd.hex
-./src/mainboard/google/kahlee/spd/samsung-K4A8G165WB-BCRC.spd.hex
-./src/mainboard/google/kahlee/spd/samsung-K4A8G165WC-BCTD.spd.hex
-./src/mainboard/google/kahlee/spd/samsung-K4A8G165WC-BCWE.spd.hex
-./src/mainboard/google/kahlee/spd/samsung-K4AAG165WA-BCTD.spd.hex
-./src/mainboard/google/kahlee/spd/samsung-K4AAG165WA-BCWE.spd.hex
-./src/mainboard/google/kahlee/spd/samsung-K4AAG165WB-MCRC.spd.hex
-./src/mainboard/google/kahlee/spd/samsung-K4AAG165WB-MCTD.spd.hex
-./src/mainboard/google/kahlee/variants/baseboard/mainboard.c
-./src/mainboard/google/kahlee/variants/nuwani/mainboard.c
-./src/mainboard/google/kahlee/variants/treeya/mainboard.c
-./src/mainboard/google/kahlee/Kconfig
-./src/mainboard/google/link/spd/elpida_4Gb_1600_x16.spd.hex
-./src/mainboard/google/link/spd/micron_4Gb_1600_1.35v_x16.spd.hex
-./src/mainboard/google/link/spd/samsung_4Gb_1600_1.35v_x16.spd.hex
-./src/mainboard/google/link/early_init.c
-./src/mainboard/google/link/hda_verb.c
-./src/mainboard/google/octopus/variants/bloog/variant.c
-./src/mainboard/google/octopus/variants/bobba/variant.c
-./src/mainboard/google/octopus/variants/casta/variant.c
-./src/mainboard/google/octopus/variants/fleex/variant.c
-./src/mainboard/google/octopus/variants/foob/variant.c
-./src/mainboard/google/octopus/variants/garg/variant.c
-./src/mainboard/google/octopus/variants/meep/variant.c
-./src/mainboard/google/octopus/variants/phaser/mainboard.c
-./src/mainboard/google/peach_pit/mainboard.c
-./src/mainboard/google/poppy/spd/empty.spd.hex
-./src/mainboard/google/poppy/spd/empty_ddr4.spd.hex
-./src/mainboard/google/poppy/spd/hynix_dimm_H5AN4G6NAFR-UHC.spd.hex
-./src/mainboard/google/poppy/spd/hynix_dimm_H5AN4G6NBJR-UHC.spd.hex
-./src/mainboard/google/poppy/spd/hynix_dimm_H5AN8G6NAFR-UHC.spd.hex
-./src/mainboard/google/poppy/spd/hynix_dimm_H5AN8G6NCJR-VKC.spd.hex
-./src/mainboard/google/poppy/spd/hynix_dimm_H5ANAG6NAMR-UHC.spd.hex
-./src/mainboard/google/poppy/spd/hynix_dimm_H5ANAG6NCMR-VKC.spd.hex
-./src/mainboard/google/poppy/spd/hynix_dimm_H9CCNNN8GTALAR-NUD.spd.hex
-./src/mainboard/google/poppy/spd/hynix_dimm_H9CCNNNBJTALAR-NUD.spd.hex
-./src/mainboard/google/poppy/spd/hynix_dimm_H9CCNNNBKTALBR-NUD.spd.hex
-./src/mainboard/google/poppy/spd/hynix_dimm_H9CCNNNCLGALAR-NUD.spd.hex
-./src/mainboard/google/poppy/spd/hynix_dimm_H9CCNNNCLGALAR-NVD.spd.hex
-./src/mainboard/google/poppy/spd/hynix_dimm_H9CCNNNCPTALBR-NUD.spd.hex
-./src/mainboard/google/poppy/spd/hynix_dimm_H9CCNNNFAGMLLR-NUD.spd.hex
-./src/mainboard/google/poppy/spd/micron_dimm_MT40A1G16KNR-075E.spd.hex
-./src/mainboard/google/poppy/spd/micron_dimm_MT40A256M16GE-083E.spd.hex
-./src/mainboard/google/poppy/spd/micron_dimm_MT40A256M16LY-075F.spd.hex
-./src/mainboard/google/poppy/spd/micron_dimm_MT40A512M16LY-075E.spd.hex
-./src/mainboard/google/poppy/spd/micron_dimm_MT40A512M16TB-062EJ.spd.hex
-./src/mainboard/google/poppy/spd/micron_dimm_MT52L1G32D4PG-107.spd.hex
-./src/mainboard/google/poppy/spd/micron_dimm_MT52L1G64D8QC-107.spd.hex
-./src/mainboard/google/poppy/spd/micron_dimm_MT52L256M32D1PF-093.spd.hex
-./src/mainboard/google/poppy/spd/micron_dimm_MT52L256M32D1PF-107.spd.hex
-./src/mainboard/google/poppy/spd/micron_dimm_MT52L256M64D2PP-107.spd.hex
-./src/mainboard/google/poppy/spd/micron_dimm_MT52L512M32D2PF-093.spd.hex
-./src/mainboard/google/poppy/spd/micron_dimm_MT52L512M32D2PF-107.spd.hex
-./src/mainboard/google/poppy/spd/micron_dimm_MT52L512M64D4PQ-107.spd.hex
-./src/mainboard/google/poppy/spd/nayna_dimm_NT6CL256T32CM-H1.spd.hex
-./src/mainboard/google/poppy/spd/samsung_dimm_K3QF3F30BM-AGCF.spd.hex
-./src/mainboard/google/poppy/spd/samsung_dimm_K3QF4F40BM-AGCF.spd.hex
-./src/mainboard/google/poppy/spd/samsung_dimm_K3QFAFA0CM-AGCF.spd.hex
-./src/mainboard/google/poppy/spd/samsung_dimm_K4A4G165WE-BCRC.spd.hex
-./src/mainboard/google/poppy/spd/samsung_dimm_K4A8G165WB-BCRC.spd.hex
-./src/mainboard/google/poppy/spd/samsung_dimm_K4A8G165WC-BCTD.spd.hex
-./src/mainboard/google/poppy/spd/samsung_dimm_K4AAG165WB-MCRC.spd.hex
-./src/mainboard/google/poppy/spd/samsung_dimm_K4E6E304EB-EGCF.spd.hex
-./src/mainboard/google/poppy/spd/samsung_dimm_K4E6E304EC-EGCF.spd.hex
-./src/mainboard/google/poppy/spd/samsung_dimm_K4E6E304ED-EGCG.spd.hex
-./src/mainboard/google/poppy/spd/samsung_dimm_K4E8E324EB-EGCF.spd.hex
-./src/mainboard/google/poppy/spd/samsung_dimm_K4E8E324ED-EGCG.spd.hex
-./src/mainboard/google/poppy/spd/samsung_dimm_K4EBE304EB-EGCG.spd.hex
-./src/mainboard/google/poppy/spd/samsung_dimm_K4EBE304EC-EGCF.spd.hex
-./src/mainboard/google/poppy/spd/samsung_dimm_K4EBE304EC-EGCG.spd.hex
-./src/mainboard/google/poppy/spd/samsung_dimm_K4EBE304ED-EGCG.spd.hex
-./src/mainboard/google/poppy/variants/nami/mainboard.c
-./src/mainboard/google/poppy/romstage.c
-./src/mainboard/google/rambi/spd/HT_micron_HTTC4G63CFR-PBA_x16_4Gb.spd.hex
-./src/mainboard/google/rambi/spd/Hynix_HMT425S6CFR6A_H5TC4G63CFR.spd.hex
-./src/mainboard/google/rambi/spd/Samsung_2Gib_K4B4G1646Q-HYK0.spd.hex
-./src/mainboard/google/rambi/spd/Samsung_2Gib_M471B5674QH0.spd.hex
-./src/mainboard/google/rambi/spd/elpida_2GiB_dimm_EDJ4216EFBG-GNL-F.spd.hex
-./src/mainboard/google/rambi/spd/empty.spd.hex
-./src/mainboard/google/rambi/spd/hynix_1GiB_dimm_H5TC2G63FFR-PBA.spd.hex
-./src/mainboard/google/rambi/spd/hynix_2GiB_dimm_H5TC4G63AFR-PBA.spd.hex
-./src/mainboard/google/rambi/spd/hynix_2GiB_dimm_H5TC4G63CFR-PBA.spd.hex
-./src/mainboard/google/rambi/spd/hynix_2GiB_dimm_H5TC4G63MFR-PBA.spd.hex
-./src/mainboard/google/rambi/spd/micron_1GiB_dimm_MT41K128M16JT-125.spd.hex
-./src/mainboard/google/rambi/spd/micron_2GiB_dimm_MT41K256M16HA-125.spd.hex
-./src/mainboard/google/rambi/spd/micron_2GiB_dimm_MT41K256M16HA-125a.spd.hex
-./src/mainboard/google/rambi/spd/micron_2GiB_dimm_MT41K256M16TW-107.spd.hex
-./src/mainboard/google/rambi/spd/samsung_1GiB_dimm_K4B2G1646Q-BYK0.spd.hex
-./src/mainboard/google/rambi/spd/samsung_2GiB_dimm_K4B4G1646E-BYK0.spd.hex
-./src/mainboard/google/rambi/spd/samsung_2GiB_dimm_K4B4G1646Q-HYK0.spd.hex
-./src/mainboard/google/rambi/variants/ninja/lan.c
-./src/mainboard/google/rambi/variants/sumo/lan.c
-./src/mainboard/google/rambi/romstage.c
-./src/mainboard/google/reef/variants/coral/mainboard.c
-./src/mainboard/google/sarien/variants/arcada/devicetree.cb
-./src/mainboard/google/slippy/variants/falco/spd/Elpida_EDJ4216EFBG.spd.hex
-./src/mainboard/google/slippy/variants/falco/spd/Hynix_HMT425S6AFR6A.spd.hex
-./src/mainboard/google/slippy/variants/falco/spd/Micron_4KTF25664HZ.spd.hex
-./src/mainboard/google/slippy/variants/falco/spd/Samsung_M471B5674QH0.spd.hex
-./src/mainboard/google/slippy/variants/falco/romstage.c
-./src/mainboard/google/slippy/variants/leon/spd/Hynix_HMT425S6AFR6A.spd.hex
-./src/mainboard/google/slippy/variants/leon/spd/Micron_4KTF25664HZ.spd.hex
-./src/mainboard/google/slippy/variants/leon/spd/Samsung_K4B4G1646Q.spd.hex
-./src/mainboard/google/slippy/variants/leon/romstage.c
-./src/mainboard/google/slippy/variants/peppy/spd/Elpida_EDJ4216EFBG.spd.hex
-./src/mainboard/google/slippy/variants/peppy/spd/Hynix_HMT425S6AFR6A.spd.hex
-./src/mainboard/google/slippy/variants/peppy/spd/Hynix_HMT425S6CFR6A.spd.hex
-./src/mainboard/google/slippy/variants/peppy/spd/Micron_4KTF25664HZ.spd.hex
-./src/mainboard/google/slippy/variants/peppy/romstage.c
-./src/mainboard/google/slippy/variants/wolf/spd/Hynix_HMT425S6AFR6A.spd.hex
-./src/mainboard/google/slippy/variants/wolf/spd/Micron_4KTF25664HZ.spd.hex
-./src/mainboard/google/slippy/variants/wolf/spd/Samsung_K4B4G1646B.spd.hex
-./src/mainboard/google/slippy/variants/wolf/romstage.c
-./src/mainboard/google/zork/spd/ddr4-spd-1.hex
-./src/mainboard/google/zork/spd/ddr4-spd-2.hex
-./src/mainboard/google/zork/spd/ddr4-spd-3.hex
-./src/mainboard/google/zork/spd/ddr4-spd-4.hex
-./src/mainboard/google/zork/spd/ddr4-spd-5.hex
-./src/mainboard/google/zork/spd/ddr4-spd-6.hex
-./src/mainboard/google/zork/spd/ddr4-spd-7.hex
-./src/mainboard/google/zork/spd/ddr4-spd-8.hex
-./src/mainboard/google/zork/spd/ddr4-spd-9.hex
-./src/mainboard/google/zork/spd/ddr4-spd-empty.hex
-./src/mainboard/hp/abm/mptable.c
-./src/mainboard/hp/folio_9480m/hda_verb.c
-./src/mainboard/hp/pavilion_m6_1035dx/mptable.c
-./src/mainboard/hp/snb_ivb_laptops/spd/hynix_4g.spd.hex
-./src/mainboard/hp/snb_ivb_laptops/variants/2760p/early_init.c
-./src/mainboard/hp/snb_ivb_laptops/variants/8470p/early_init.c
-./src/mainboard/hp/snb_ivb_laptops/variants/revolve_810_g1/early_init.c
-./src/mainboard/hp/z220_sff_workstation/early_init.c
-./src/mainboard/ibase/mb899/cmos.layout
-./src/mainboard/ibase/mb899/superio_hwm.c
-./src/mainboard/intel/adlrvp/spd/adlrvp_lp4.spd.hex
-./src/mainboard/intel/adlrvp/spd/adlrvp_lp5.spd.hex
-./src/mainboard/intel/adlrvp/spd/empty.spd.hex
-./src/mainboard/intel/adlrvp/memory.c
-./src/mainboard/intel/apollolake_rvp/romstage.c
-./src/mainboard/intel/coffeelake_rvp/variants/cml_u/hda_verb.c
-./src/mainboard/intel/coffeelake_rvp/variants/whl_u/hda_verb.c
-./src/mainboard/intel/elkhartlake_crb/spd/ehlcrb.spd.hex
-./src/mainboard/intel/elkhartlake_crb/spd/empty.spd.hex
-./src/mainboard/intel/glkrvp/romstage.c
-./src/mainboard/intel/harcuvar/spd/micron_4GiB_dimm_MTA9ASF51272PZ-2G1A2.spd.hex
-./src/mainboard/intel/harcuvar/spd/spd.c
-./src/mainboard/intel/icelake_rvp/spd/empty.spd.hex
-./src/mainboard/intel/icelake_rvp/spd/samsung_K4F6E304HBMGCJ.spd.hex
-./src/mainboard/intel/icelake_rvp/variants/baseboard/include/baseboard/hda_verb.h
-./src/mainboard/intel/jasperlake_rvp/spd/empty.spd.hex
-./src/mainboard/intel/jasperlake_rvp/spd/jslrvp.spd.hex
-./src/mainboard/intel/kblrvp/spd/empty.spd.hex
-./src/mainboard/intel/kblrvp/spd/hynix_dimm_H9CCNNNBJTMLAR.spd.hex
-./src/mainboard/intel/kblrvp/spd/rvp3.spd.hex
-./src/mainboard/intel/kblrvp/variants/rvp11/include/variant/hda_verb.h
-./src/mainboard/intel/kblrvp/variants/rvp3/include/variant/hda_verb.h
-./src/mainboard/intel/kblrvp/variants/rvp7/include/variant/hda_verb.h
-./src/mainboard/intel/kblrvp/Kconfig
-./src/mainboard/intel/kunimitsu/spd/empty.spd.hex
-./src/mainboard/intel/kunimitsu/spd/hynix_dimm_H9CCNNN8JTALAR-NUD-1G-1866.spd.hex
-./src/mainboard/intel/kunimitsu/spd/hynix_dimm_H9CCNNN8JTBLAR-NUD-1G-1866.spd.hex
-./src/mainboard/intel/kunimitsu/spd/hynix_dimm_H9CCNNNBLTALAR-NUD-2G-1866.spd.hex
-./src/mainboard/intel/kunimitsu/spd/hynix_dimm_H9CCNNNBLTBLAR-NUD-2G-1866.spd.hex
-./src/mainboard/intel/kunimitsu/spd/mic_dimm_EDF8132A3MA-JD-F-1G-1866.spd.hex
-./src/mainboard/intel/kunimitsu/spd/samsung_dimm_K4E6E304EE-EGCF-2G-1866.spd.hex
-./src/mainboard/intel/kunimitsu/spd/samsung_dimm_K4E8E304EE-EGCE.spd.hex
-./src/mainboard/intel/kunimitsu/spd/samsung_dimm_K4E8E304EE-EGCF-1G-1866.spd.hex
-./src/mainboard/intel/kunimitsu/spd/spd_util.c
-./src/mainboard/intel/leafhill/Kconfig
-./src/mainboard/intel/leafhill/romstage.c
-./src/mainboard/intel/minnow3/Kconfig
-./src/mainboard/intel/minnow3/romstage.c
-./src/mainboard/intel/strago/Kconfig
-./src/mainboard/intel/tglrvp/spd/Hynix-H9HKNNNEBMAV-4267.spd.hex
-./src/mainboard/intel/tglrvp/spd/Micron-MT53D1G64D8SQ-046.spd.hex
-./src/mainboard/intel/tglrvp/spd/Samsung-K4UBE3D4AA-MGCL.spd.hex
-./src/mainboard/intel/tglrvp/spd/empty.spd.hex
-./src/mainboard/intel/tglrvp/variants/tglrvp_up3/devicetree.cb
-./src/mainboard/intel/tglrvp/variants/tglrvp_up4/devicetree.cb
-./src/mainboard/intel/cannonlake_rvp/spd/empty.spd.hex
-./src/mainboard/intel/cannonlake_rvp/spd/samsung_ddr4_4GB.spd.hex
-./src/mainboard/intel/cannonlake_rvp/spd/samsung_lpddr4_8GB.spd.hex
-./src/mainboard/jetway/nf81-t56n-lf/Kconfig
-./src/mainboard/kontron/986lcd-m/cmos.layout
-./src/mainboard/kontron/986lcd-m/mainboard.c
-./src/mainboard/lenovo/g505s/mptable.c
-./src/mainboard/lenovo/s230u/spd/elpida_2gb.spd.hex
-./src/mainboard/lenovo/s230u/spd/elpida_4gb.spd.hex
-./src/mainboard/lenovo/s230u/spd/elpida_8gb.spd.hex
-./src/mainboard/lenovo/s230u/spd/hynix_2gb.spd.hex
-./src/mainboard/lenovo/s230u/spd/hynix_4gb.spd.hex
-./src/mainboard/lenovo/s230u/spd/samsung_2gb.spd.hex
-./src/mainboard/lenovo/s230u/spd/samsung_4gb.spd.hex
-./src/mainboard/lenovo/s230u/early_init.c
-./src/mainboard/lenovo/t430s/variants/t431s/spd/samsung_4gb.spd.hex
-./src/mainboard/lenovo/t430s/variants/t431s/romstage.c
-./src/mainboard/lenovo/t440p/hda_verb.c
-./src/mainboard/lenovo/x1_carbon_gen1/spd/elpida.spd.hex
-./src/mainboard/lenovo/x1_carbon_gen1/spd/hynix.spd.hex
-./src/mainboard/lenovo/x1_carbon_gen1/spd/samsung.spd.hex
-./src/mainboard/lenovo/x1_carbon_gen1/early_init.c
-./src/mainboard/lenovo/x220/variants/x1/romstage.c
-./src/mainboard/lenovo/x220/early_init.c
-./src/mainboard/lippert/frontrunner-af/mptable.c
-./src/mainboard/msi/ms7707/early_init.c
-./src/mainboard/msi/ms7721/mptable.c
-./src/mainboard/opencellular/elgon/gbcv2.dts
-./src/mainboard/packardbell/ms2290/mainboard.c
-./src/mainboard/pcengines/apu1/Kconfig
-./src/mainboard/pcengines/apu2/Kconfig
-./src/mainboard/portwell/m107/spd/KINGSTON_B5116ECMDXGGB.spd.hex
-./src/mainboard/portwell/m107/spd/MICRON_MT41K512M16HA-125A.spd.hex
-./src/mainboard/portwell/m107/spd/SAMSUNG_K4B8G1646D-MYKO.spd.hex
-./src/mainboard/protectli/vault_bsw/Kconfig
-./src/mainboard/razer/blade_stealth_kbl/spd/micron_dimm_MT52L1G32D4PG-107.spd.hex
-./src/mainboard/razer/blade_stealth_kbl/spd/micron_dimm_MT52L512M32D2PF-107.spd.hex
-./src/mainboard/samsung/lumpy/spd/lumpy.spd.hex
-./src/mainboard/samsung/lumpy/early_init.c
-./src/mainboard/sapphire/pureplatinumh61/early_init.c
-./src/mainboard/siemens/mc_apl1/variants/mc_apl1/lcd_panel.c
-./src/mainboard/siemens/mc_apl1/variants/mc_apl4/lcd_panel.c
-./src/mainboard/siemens/mc_apl1/variants/mc_apl5/lcd_panel.c
-./src/mainboard/siemens/mc_apl1/mainboard.c
-./src/mainboard/siemens/mc_apl1/romstage.c
-./src/mainboard/system76/lemp9/spd/samsung-K4AAG165WA-BCTD.spd.hex
-./src/mainboard/up/squared/romstage.c
-./src/northbridge/amd/pi/00630F01/Kconfig
-./src/northbridge/amd/pi/00730F01/Kconfig
-./src/northbridge/intel/gm45/raminit_rcomp_calibration.c
-./src/northbridge/intel/gm45/raminit_read_write_training.c
-./src/northbridge/intel/haswell/Kconfig
-./src/northbridge/intel/haswell/raminit.c
-./src/northbridge/intel/i945/raminit.c
-./src/northbridge/intel/ironlake/raminit.c
-./src/northbridge/intel/ironlake/raminit_tables.c
-./src/northbridge/intel/pineview/raminit.c
-./src/northbridge/intel/sandybridge/Kconfig
-./src/northbridge/intel/sandybridge/gma.c
-./src/northbridge/intel/sandybridge/raminit.c
-./src/northbridge/intel/sandybridge/raminit_mrc.c
-./src/northbridge/intel/sandybridge/raminit_tables.c
-./src/northbridge/intel/x4x/dq_dqs.c
-./src/northbridge/intel/x4x/raminit_ddr23.c
-./src/northbridge/intel/x4x/raminit_tables.c
-./src/security/intel/stm/Kconfig
-./src/security/intel/stm/StmPlatformSmm.c
-./src/security/intel/txt/Kconfig
-./src/security/tpm/tss/tcg-1.2/tss_commands.h
-./src/security/vboot/secdata_tpm.c
-./src/soc/amd/picasso/Kconfig
-./src/soc/amd/picasso/Makefile.inc
-./src/soc/amd/picasso/cpu.c
-./src/soc/amd/picasso/update_microcode.c
-./src/soc/amd/stoneyridge/Kconfig
-./src/soc/cavium/cn81xx/Kconfig
-./src/soc/cavium/common/rom_clib_s_nbl1fw.bin.hex
-./src/soc/cavium/common/rom_csib_s_nbl1fw.bin.hex
-./src/soc/intel/apollolake/Kconfig
-./src/soc/intel/apollolake/nhlt.c
-./src/soc/intel/baytrail/romstage/raminit.c
-./src/soc/intel/baytrail/Kconfig
-./src/soc/intel/baytrail/acpi.c
-./src/soc/intel/baytrail/modphy_table.c
-./src/soc/intel/braswell/acpi.c
-./src/soc/intel/braswell/gpio.c
-./src/soc/intel/broadwell/Kconfig
-./src/soc/intel/broadwell/cpu/acpi.c
-./src/soc/intel/broadwell/raminit.c
-./src/soc/intel/cannonlake/nhlt.c
-./src/soc/intel/common/block/cpu/car/cache_as_ram_fsp.S
-./src/soc/intel/common/block/cse/cse_rw_metadata.c
-./src/soc/intel/common/mma.c
-./src/soc/intel/denverton_ns/acpi.c
-./src/soc/intel/denverton_ns/chip.c
-./src/soc/intel/jasperlake/spd/lp4x-spd-1.hex
-./src/soc/intel/jasperlake/spd/lp4x-spd-2.hex
-./src/soc/intel/jasperlake/spd/lp4x-spd-3.hex
-./src/soc/intel/jasperlake/spd/lp4x-spd-4.hex
-./src/soc/intel/jasperlake/spd/lp4x-spd-5.hex
-./src/soc/intel/jasperlake/spd/lp4x-spd-6.hex
-./src/soc/intel/jasperlake/spd/lp4x-spd-7.hex
-./src/soc/intel/jasperlake/spd/placeholder.spd.hex
-./src/soc/intel/quark/romstage/romstage.c
-./src/soc/intel/quark/Kconfig
-./src/soc/intel/skylake/nhlt/da7219.c
-./src/soc/intel/skylake/nhlt/dmic.c
-./src/soc/intel/skylake/nhlt/max98357.c
-./src/soc/intel/skylake/nhlt/max98373.c
-./src/soc/intel/skylake/nhlt/max98927.c
-./src/soc/intel/skylake/nhlt/nau88l25.c
-./src/soc/intel/skylake/nhlt/rt5514.c
-./src/soc/intel/skylake/nhlt/rt5663.c
-./src/soc/intel/skylake/nhlt/ssm4567.c
-./src/soc/intel/tigerlake/spd/ddr4-spd-1.hex
-./src/soc/intel/tigerlake/spd/ddr4-spd-2.hex
-./src/soc/intel/tigerlake/spd/ddr4-spd-3.hex
-./src/soc/intel/tigerlake/spd/ddr4-spd-4.hex
-./src/soc/intel/tigerlake/spd/ddr4-spd-5.hex
-./src/soc/intel/tigerlake/spd/ddr4-spd-6.hex
-./src/soc/intel/tigerlake/spd/ddr4-spd-7.hex
-./src/soc/intel/tigerlake/spd/ddr4-spd-8.hex
-./src/soc/intel/tigerlake/spd/ddr4-spd-9.hex
-./src/soc/intel/tigerlake/spd/ddr4-spd-empty.hex
-./src/soc/intel/tigerlake/spd/lp4x-spd-1.hex
-./src/soc/intel/tigerlake/spd/lp4x-spd-2.hex
-./src/soc/intel/tigerlake/spd/lp4x-spd-3.hex
-./src/soc/intel/tigerlake/spd/lp4x-spd-4.hex
-./src/soc/intel/tigerlake/spd/lp4x-spd-5.hex
-./src/soc/intel/tigerlake/spd/placeholder.spd.hex
-./src/soc/intel/xeon_sp/skx/chip.c
-./src/soc/mediatek/mt8183/Kconfig
-./src/soc/mediatek/mt8183/spm.c
-./src/soc/mediatek/mt8192/Kconfig
-./src/soc/mediatek/mt8192/mt6315.c
-./src/soc/mediatek/mt8192/mt6359p.c
-./src/soc/nvidia/tegra210/Kconfig
-./src/soc/nvidia/tegra210/mtc.c
-./src/soc/qualcomm/ipq40xx/Kconfig
-./src/soc/qualcomm/ipq40xx/lcc.c
-./src/soc/qualcomm/ipq806x/Kconfig
-./src/soc/qualcomm/ipq806x/blobs_init.c
-./src/soc/qualcomm/ipq806x/lcc.c
-./src/soc/qualcomm/sc7180/display/dsi_phy.c
-./src/soc/samsung/exynos5250/clock.c
-./src/soc/samsung/exynos5420/clock.c
-./src/southbridge/amd/agesa/hudson/Kconfig
-./src/southbridge/amd/cimx/sb800/Kconfig
-./src/southbridge/amd/pi/hudson/Kconfig
-./src/southbridge/intel/bd82x6x/lpc.c
-./src/southbridge/intel/common/firmware/Kconfig
-./src/southbridge/intel/i82801ix/dmi_setup.c
-./src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/ON/F14OnInitEarlyTable.c
-./src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500000B.c
-./src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500001A.c
-./src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000029.c
-./src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000119.c
-./src/vendorcode/amd/agesa/f14/Proc/CPU/cpuMicrocodePatch.c
-./src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbSmuFirmware.h
-./src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieAlibSsdt.h
-./src/vendorcode/amd/agesa/f14/Proc/Mem/Main/muc.c
-./src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnInitEarlyTable.c
-./src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnMicrocodePatch0600111F_Enc.c
-./src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/cpuF15WheaInitDataTables.c
-./src/vendorcode/amd/agesa/f15tn/Proc/CPU/cpuMicrocodePatch.c
-./src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxIntegratedInfoTableTN.c
-./src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GfxLibTN.c
-./src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbCacWeightsTN.h
-./src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbSmuFirmwareTN.h
-./src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieAlibSsdtTNFM2.h
-./src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieAlibSsdtTNFS1.h
-./src/vendorcode/amd/agesa/f15tn/Proc/Mem/Main/muc.c
-./src/vendorcode/amd/agesa/f15tn/Proc/Mem/Ps/TN/mptn3.c
-./src/vendorcode/amd/agesa/f15tn/Proc/Mem/Tech/DDR3/mtlrdimm3.c
-./src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbId7001MicrocodePatch.c
-./src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbInitEarlyTable.c
-./src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/cpuF16WheaInitDataTables.c
-./src/vendorcode/amd/agesa/f16kb/Proc/CPU/cpuMicrocodePatch.c
-./src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxIntTableV3/GfxLibV3.c
-./src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/AlibSsdtKB.h
-./src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbF1TableKB.c
-./src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbSamuPatchKB.h
-./src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbSmuFirmwareKB.h
-./src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/excel925.h
-./src/vendorcode/amd/agesa/f16kb/Proc/Mem/Main/muc.c
-./src/vendorcode/amd/agesa/f16kb/Proc/Mem/Ps/KB/mpkb3.c
-./src/vendorcode/amd/cimx/sb800/SATA.c
-./src/vendorcode/amd/fsp/picasso/bl_uapp/bl_uapp_end.S
-./src/vendorcode/amd/fsp/picasso/bl_uapp/bl_uapp_header.inc
-./src/vendorcode/amd/pi/Kconfig
-./src/vendorcode/cavium/bdk/libbdk-hal/if/bdk-if-phy-vetesse-8514.c
-./src/vendorcode/cavium/bdk/libbdk-hal/if/bdk-if-phy-vetesse-xfi.c
-./src/vendorcode/cavium/bdk/libbdk-hal/if/bdk-if-phy-vetesse.c
-./src/vendorcode/cavium/bdk/libdram/lib_octeon_shared.c
-./src/vendorcode/eltan/security/verified_boot/vboot_check.c
-./src/vendorcode/google/chromeos/build-snow.sh
-./src/vendorcode/google/chromeos/sar.c
-./src/vendorcode/intel/edk2/UDK2017/MdePkg/Include/IndustryStandard/Tpm12.h
-./src/vendorcode/intel/edk2/UDK2017/MdePkg/Include/Protocol/HiiConfigAccess.h
-./src/vendorcode/intel/edk2/edk2-stable202005/MdePkg/Include/IndustryStandard/Tpm12.h
-./src/vendorcode/intel/edk2/edk2-stable202005/MdePkg/Include/Protocol/HiiConfigAccess.h
-./src/vendorcode/intel/edk2/edk2-stable202005/MdePkg/Include/Register/Intel/ArchitecturalMsr.h
-./src/vendorcode/intel/fsp/fsp2_0/cannonlake/FspmUpd.h
-./util/amdtools/example_input/lspci-cb-48G-667MHz-18.2-20090909e
-./util/amdtools/example_input/lspci-prop-48G-667MHz-18.2
-./util/autoport/readme.md
-./util/bincfg/bincfg.lex.c_shipped
-./util/bincfg/bincfg.tab.c_shipped
-./util/cbfstool/lz4/lib/lz4.c
-./util/cbfstool/fit.c
-./util/cbfstool/fmd_parser.c_shipped
-./util/cbfstool/fmd_scanner.c_shipped
-./util/cbfstool/linux_trampoline.c
-./util/ifdtool/ifdtool.c
-./util/intelmetool/intelmetool.c
-./util/kbc1126/kbc1126_ec_dump.c
-./util/kconfig/zconf.hash.c_shipped
-./util/kconfig/zconf.lex.c_shipped
-./util/kconfig/zconf.tab.c_shipped
-./util/mma/mma_automated_test.sh
-./util/mtkheader/gen-bl-img.py
-./util/nvidia/cbootimage/samples/sign.sh
-./util/nvidia/cbootimage/src/aes_ref.c
-./util/nvramtool/accessors/layout-bin.c
-./util/qualcomm/scripts/cmm/debug_cb_common.cmm
-./util/qualcomm/scripts/cmm/debug_chroot_common.cmm
-./util/qualcomm/createxbl.py
-./util/riscv/make-spike-elf.sh
-./util/riscv/sifive-gpt.py
-./util/rockchip/make_idb.py
-./util/sconfig/lex.yy.c_shipped
-./util/sconfig/sconfig.tab.c_shipped
-./util/spd_tools/ddr4/gen_part_id.go
-./util/spd_tools/ddr4/gen_spd.go
-./util/spd_tools/lp4x/gen_spd.go
-./util/spdtool/spdtool.py
-./util/superiotool/fintek.c
-./util/superiotool/ite.c
-./util/superiotool/nuvoton.c
-./util/superiotool/smsc.c
-./util/superiotool/winbond.c
-./util/xcompile/xcompile
-./Makefile.inc
diff --git a/resources/coreboot/macbook21/patches/0001-apple-macbook21-Set-default-VRAM-to-64MiB-instead-of.patch b/resources/coreboot/default/patches/0001-apple-macbook21-Set-default-VRAM-to-64MiB-instead-of.patch
index e1b0ee03..74090dc0 100644
--- a/resources/coreboot/macbook21/patches/0001-apple-macbook21-Set-default-VRAM-to-64MiB-instead-of.patch
+++ b/resources/coreboot/default/patches/0001-apple-macbook21-Set-default-VRAM-to-64MiB-instead-of.patch
@@ -1,7 +1,7 @@
-From 4ab0850279e98ccd715fca75813407046e9eac27 Mon Sep 17 00:00:00 2001
+From 4df63d823092dc06e3cfc27165a4850b996af90d Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@retroboot.org>
Date: Fri, 19 Mar 2021 05:54:58 +0000
-Subject: [PATCH 1/2] apple/macbook21: Set default VRAM to 64MiB instead of
+Subject: [PATCH 01/11] apple/macbook21: Set default VRAM to 64MiB instead of
8MiB
---
diff --git a/resources/coreboot/default/patches/0001-hardcode-tianocore-revisions-and-don-t-automatically.patch b/resources/coreboot/default/patches/0001-hardcode-tianocore-revisions-and-don-t-automatically.patch
deleted file mode 100644
index a67448e1..00000000
--- a/resources/coreboot/default/patches/0001-hardcode-tianocore-revisions-and-don-t-automatically.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From 9000fe203d31e584bdc7d3e43d7ea615d9335205 Mon Sep 17 00:00:00 2001
-From: Leah Rowe <leah@libreboot.org>
-Date: Thu, 13 May 2021 23:52:08 +0100
-Subject: [PATCH 01/19] hardcode tianocore revisions, and don't automatically
- download
-
----
- Makefile | 2 +-
- payloads/external/tianocore/Makefile | 57 ++++++++--------------------
- 2 files changed, 17 insertions(+), 42 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 02c6288f15..8290b45e89 100644
---- a/Makefile
-+++ b/Makefile
-@@ -486,7 +486,7 @@ distclean-utils:
- $(MAKE) -C util/$(tool) distclean MFLAGS= MAKEFLAGS= ; \
- rm -f /util/$(tool)/junit.xml;)
-
--distclean: clean clean-ctags clean-cscope distclean-payloads distclean-utils
-+distclean: clean clean-ctags clean-cscope distclean-utils
- rm -f .config .config.old ..config.tmp* .kconfig.d .tmpconfig* .ccwrap .xcompile
- rm -rf coreboot-builds coreboot-builds-chromeos
- rm -f abuild*.xml junit.xml* util/lint/junit.xml
-diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile
-index 7cd34f1732..3527b7a2ad 100644
---- a/payloads/external/tianocore/Makefile
-+++ b/payloads/external/tianocore/Makefile
-@@ -1,5 +1,8 @@
- ## SPDX-License-Identifier: GPL-2.0-only
-
-+# This file has been modified for libreboot/osboot/osboot-libre.
-+# The tianocore repo/branch/revision has been hardcoded, as have some options
-+
- # force the shell to bash - the edksetup.sh script doesn't work with dash
- export SHELL := env bash
-
-@@ -9,51 +12,31 @@ project_git_repo=https://github.com/mrchromebox/edk2
- project_git_branch=coreboot_fb
- upstream_git_repo=https://github.com/tianocore/edk2
-
--ifeq ($(CONFIG_TIANOCORE_UEFIPAYLOAD),y)
--bootloader=UefiPayloadPkg
--logo_pkg=MdeModulePkg
--build_flavor=-D BOOTLOADER=COREBOOT -D PCIE_BASE=$(CONFIG_MMCONF_BASE_ADDRESS) -DPS2_KEYBOARD_ENABLE
--TAG=upstream/master
--else
- bootloader=CorebootPayloadPkg
- logo_pkg=CorebootPayloadPkg
- # STABLE revision is MrChromebox's coreboot framebuffer (coreboot_fb) branch
--TAG=origin/$(project_git_branch)
--endif
--
--ifneq ($(CONFIG_TIANOCORE_REVISION_ID),)
--TAG=$(CONFIG_TIANOCORE_REVISION_ID)
--endif
-+TAG=ca08920ded1649921a12105d1959df423733431f
-+# above is a commit ID in MrChromebox's coreboot_fb branch
-
- export EDK_TOOLS_PATH=$(project_dir)/BaseTools
-
--ifeq ($(CONFIG_TIANOCORE_DEBUG),y)
--BUILD_TYPE=DEBUG
--else
- BUILD_TYPE=RELEASE
--endif
-
--ifneq ($(CONFIG_TIANOCORE_USE_8254_TIMER), y)
- TIMER=-DUSE_HPET_TIMER
--endif
-
--TIMEOUT=-D PLATFORM_BOOT_TIMEOUT=$(CONFIG_TIANOCORE_BOOT_TIMEOUT)
-+# see coreboot 61a3c8a005922d46425c84f847c0ad26e9c3cdca
-+# "2 seconds for board with internal display"
-+# "5 seconds for board without internal display"
-+# libreboot takes the shotgun approach. 5 seconds for all
-+TIMEOUT=-D PLATFORM_BOOT_TIMEOUT=5
-
--ifeq ($(CONFIG_TIANOCORE_COREBOOTPAYLOAD),y)
--ifeq ($(CONFIG_TIANOCORE_TARGET_IA32), y)
--ARCH=-a IA32 -p CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
--else
- ARCH=-a IA32 -a X64 -p CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
--endif
--else
--ARCH=-a IA32 -a X64 -p UefiPayloadPkg/UefiPayloadPkg.dsc
--endif
-
--BUILD_STR=-q $(ARCH) -t COREBOOT -b $(BUILD_TYPE) $(TIMER) $(TIMEOUT) $(build_flavor)
-+BUILD_STR=-q $(ARCH) -t COREBOOT -b $(BUILD_TYPE) $(TIMER) $(TIMEOUT)
-
- all: clean build
-
--$(project_dir):
-+download:
- echo " Cloning $(project_name) from Git"
- git clone --branch $(project_git_branch) $(project_git_repo) $(project_dir); \
- cd $(project_dir); \
-@@ -76,17 +59,9 @@ update: $(project_dir)
- git submodule update --init
-
- checktools:
-- echo "Checking uuid-dev..."
-- echo "#include <uuid/uuid.h>" > libtest.c
-- echo "int main(int argc, char **argv) { (void) argc; (void) argv; return 0; }" >> libtest.c
-- $(HOSTCC) $(HOSTCCFLAGS) libtest.c -o libtest >/dev/null 2>&1 && echo " found uuid-dev." || \
-- ( echo " Not found."; echo "ERROR: please_install uuid-dev (libuuid-devel)"; exit 1 )
-- rm -rf libtest.c libtest
-- echo "Checking nasm..."
-- type nasm > /dev/null 2>&1 && echo " found nasm." || \
-- ( echo " Not found."; echo "Error: Please install nasm."; exit 1 )
--
--build: update checktools
-+ echo "tianocore tool check disabled"
-+
-+build: checktools
- unset CC; $(MAKE) -C $(project_dir)/BaseTools
- echo " build $(project_name) $(TAG)"
- if [ -n "$(CONFIG_TIANOCORE_BOOTSPLASH_FILE)" ]; then \
-@@ -116,4 +91,4 @@ clean:
- distclean:
- rm -rf $(project_dir)
-
--.PHONY: all update checktools config build clean distclean
-+.PHONY: all update checktools config build clean distclean download
---
-2.25.1
-
diff --git a/resources/coreboot/macbook21/patches/0002-add-c3-and-clockgen-to-apple-macbook21.patch b/resources/coreboot/default/patches/0002-add-c3-and-clockgen-to-apple-macbook21.patch
index 0921ab8c..11c26913 100644
--- a/resources/coreboot/macbook21/patches/0002-add-c3-and-clockgen-to-apple-macbook21.patch
+++ b/resources/coreboot/default/patches/0002-add-c3-and-clockgen-to-apple-macbook21.patch
@@ -1,7 +1,7 @@
-From 3b03c7ce6499165959f1335a6b4d66d576c6b7ff Mon Sep 17 00:00:00 2001
+From a43fee19b7a4615aceb9bdf96afda980c106445e Mon Sep 17 00:00:00 2001
From: Vitali64 <5405891-vitali64yt@users.noreply.gitlab.com>
Date: Wed, 27 Oct 2021 13:36:01 +0200
-Subject: [PATCH 2/2] add c3 and clockgen to apple/macbook21
+Subject: [PATCH 02/11] add c3 and clockgen to apple/macbook21
---
src/mainboard/apple/macbook21/Kconfig | 1 +
diff --git a/resources/coreboot/default/patches/0002-lenovo-x60-64MiB-Video-RAM-changed-to-default-previo.patch b/resources/coreboot/default/patches/0003-lenovo-x60-64MiB-Video-RAM-changed-to-default-previo.patch
index 47a99bf0..08b289d7 100644
--- a/resources/coreboot/default/patches/0002-lenovo-x60-64MiB-Video-RAM-changed-to-default-previo.patch
+++ b/resources/coreboot/default/patches/0003-lenovo-x60-64MiB-Video-RAM-changed-to-default-previo.patch
@@ -1,7 +1,7 @@
-From 7abacb9f5b07df89136751fbcc1569fe02f1c23b Mon Sep 17 00:00:00 2001
+From 6302d89dfd785330944ad091767c7e7eb8da4aed Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@osboot.org>
Date: Sun, 3 Jan 2021 03:34:01 +0000
-Subject: [PATCH 02/19] lenovo/x60: 64MiB Video RAM changed to default
+Subject: [PATCH 03/11] lenovo/x60: 64MiB Video RAM changed to default
(previously it was 8MiB)
---
diff --git a/resources/coreboot/default/patches/0003-lenovo-t60-make-64MiB-VRAM-the-default-in-cmos.defau.patch b/resources/coreboot/default/patches/0004-lenovo-t60-make-64MiB-VRAM-the-default-in-cmos.defau.patch
index f4ccc837..67c4a892 100644
--- a/resources/coreboot/default/patches/0003-lenovo-t60-make-64MiB-VRAM-the-default-in-cmos.defau.patch
+++ b/resources/coreboot/default/patches/0004-lenovo-t60-make-64MiB-VRAM-the-default-in-cmos.defau.patch
@@ -1,7 +1,7 @@
-From d57e7edf35a923ebf0177b9a816179be0ad4b72f Mon Sep 17 00:00:00 2001
+From f13f10f6b61d0581970a508b626cd63adf607eff Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@osboot.org>
Date: Mon, 22 Feb 2021 22:16:59 +0000
-Subject: [PATCH 03/19] lenovo/t60: make 64MiB VRAM the default in cmos.default
+Subject: [PATCH 04/11] lenovo/t60: make 64MiB VRAM the default in cmos.default
---
src/mainboard/lenovo/t60/cmos.default | 2 +-
diff --git a/resources/coreboot/default/patches/0014-lenovo-t400-set-VRAM-to-352MiB-VRAM-by-default.patch b/resources/coreboot/default/patches/0005-lenovo-t400-set-VRAM-to-352MiB-VRAM-by-default.patch
index 48752583..d205f2a6 100644
--- a/resources/coreboot/default/patches/0014-lenovo-t400-set-VRAM-to-352MiB-VRAM-by-default.patch
+++ b/resources/coreboot/default/patches/0005-lenovo-t400-set-VRAM-to-352MiB-VRAM-by-default.patch
@@ -1,7 +1,7 @@
-From ade5066801bbc20e88205299e3b66de7f1a1bc82 Mon Sep 17 00:00:00 2001
+From e3b971134ffc2f52e575efe53a571978ed291dc6 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Fri, 14 May 2021 13:10:33 +0100
-Subject: [PATCH 14/19] lenovo/t400: set VRAM to 352MiB VRAM by default
+Subject: [PATCH 05/11] lenovo/t400: set VRAM to 352MiB VRAM by default
In the past, this caused stability issues so we set it to 256MiB. Nowadays,
coreboot has fixed the issue preventing this. See:
diff --git a/resources/coreboot/default/patches/0005-util-cbfstool-Do-not-set-D_XOPEN_SOURCE-on-FreeBSD.patch b/resources/coreboot/default/patches/0005-util-cbfstool-Do-not-set-D_XOPEN_SOURCE-on-FreeBSD.patch
deleted file mode 100644
index 64bdb33c..00000000
--- a/resources/coreboot/default/patches/0005-util-cbfstool-Do-not-set-D_XOPEN_SOURCE-on-FreeBSD.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 58cd6e0c97c67fdd8948975b74567e1ff6d8d6ee Mon Sep 17 00:00:00 2001
-From: Idwer Vollering <vidwer@gmail.com>
-Date: Sun, 9 May 2021 18:16:26 +0200
-Subject: [PATCH 05/19] util/cbfstool: Do not set -D_XOPEN_SOURCE on FreeBSD
-
-Fixes compilation on FreeBSD CURRENT, and possibly other releases.
-
-The compiler, clang, complained about:
-util/cbfstool/cbfstool.c:181:40: error: implicit declaration of function 'memmem' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
-util/cbfstool/cbfstool.c:181:31: error: incompatible integer to pointer conversion initializing 'struct metadata_hash_anchor *' with an expression of type 'int' [-Werror,-Wint-conversion]
-
-Signed-off-by: Idwer Vollering <vidwer@gmail.com>
-Change-Id: I45c02a21709160df44fc8da329f6c4a9bad24478
-Reviewed-on: https://review.coreboot.org/c/coreboot/+/53996
-Reviewed-by: Angel Pons <th3fanbus@gmail.com>
-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
----
- util/cbfstool/Makefile.inc | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc
-index 5b49fe80ad..47b89e57b0 100644
---- a/util/cbfstool/Makefile.inc
-+++ b/util/cbfstool/Makefile.inc
-@@ -95,7 +95,6 @@ TOOLCFLAGS += -Wstrict-prototypes -Wwrite-strings
- TOOLCFLAGS += -O2
- TOOLCPPFLAGS ?= -D_DEFAULT_SOURCE # memccpy() from string.h
- TOOLCPPFLAGS += -D_BSD_SOURCE -D_SVID_SOURCE # _DEFAULT_SOURCE for older glibc
--TOOLCPPFLAGS += -D_XOPEN_SOURCE=700 # strdup() from string.h
- TOOLCPPFLAGS += -D_GNU_SOURCE # memmem() from string.h
- TOOLCPPFLAGS += -I$(top)/util/cbfstool/flashmap
- TOOLCPPFLAGS += -I$(top)/util/cbfstool
-@@ -113,6 +112,10 @@ TOOLCPPFLAGS += -I$(top)/src/vendorcode/intel/edk2/uefi_2.4/MdePkg/Include
- TOOLLDFLAGS ?=
- HOSTCFLAGS += -fms-extensions
-
-+ifneq ($(shell uname -o 2>/dev/null), FreeBSD)
-+TOOLCPPFLAGS += -D_XOPEN_SOURCE=700 # strdup() from string.h
-+endif
-+
- ifeq ($(shell uname -s | cut -c-7 2>/dev/null), MINGW32)
- TOOLCFLAGS += -mno-ms-bitfields
- endif
---
-2.25.1
-
diff --git a/resources/coreboot/default/patches/0015-lenovo-x200-set-VRAM-to-352MiB-by-default.patch b/resources/coreboot/default/patches/0006-lenovo-x200-set-VRAM-to-352MiB-by-default.patch
index c3d3bd64..9ff0ad8d 100644
--- a/resources/coreboot/default/patches/0015-lenovo-x200-set-VRAM-to-352MiB-by-default.patch
+++ b/resources/coreboot/default/patches/0006-lenovo-x200-set-VRAM-to-352MiB-by-default.patch
@@ -1,7 +1,7 @@
-From a4b575bf23bade522ac6a777793ef01abcb2b821 Mon Sep 17 00:00:00 2001
+From 383c273f0c44eec93cd55c3d21d6c1a8316d8dbe Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Fri, 14 May 2021 13:11:59 +0100
-Subject: [PATCH 15/19] lenovo/x200: set VRAM to 352MiB by default
+Subject: [PATCH 06/11] lenovo/x200: set VRAM to 352MiB by default
This fix makes it possible:
https://review.coreboot.org/c/coreboot/+/16831
diff --git a/resources/coreboot/default/patches/0006-src-security-intel-stm-Add-warning-for-non-reproduci.patch b/resources/coreboot/default/patches/0006-src-security-intel-stm-Add-warning-for-non-reproduci.patch
deleted file mode 100644
index b01cf1c3..00000000
--- a/resources/coreboot/default/patches/0006-src-security-intel-stm-Add-warning-for-non-reproduci.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 1804c7cb2e6e62a363a18f237ecdf8337e58c20d Mon Sep 17 00:00:00 2001
-From: Martin Roth <martin@coreboot.org>
-Date: Mon, 10 May 2021 11:28:45 -0600
-Subject: [PATCH 06/19] src/security/intel/stm: Add warning for
- non-reproducible build
-
-Because the STM build doesn't use the coreboot toolchain it's not
-reproducible. Make sure that's displayed during the build.
-
-Signed-off-by: Martin Roth <martin@coreboot.org>
-Change-Id: I3f0101400dc221eca09c928705f30d30492f171f
-Reviewed-on: https://review.coreboot.org/c/coreboot/+/54020
-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-Reviewed-by: Angel Pons <th3fanbus@gmail.com>
-Reviewed-by: Patrick Georgi <pgeorgi@google.com>
----
- src/security/intel/stm/Makefile | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/security/intel/stm/Makefile b/src/security/intel/stm/Makefile
-index 1493869e80..31e5bdd88a 100644
---- a/src/security/intel/stm/Makefile
-+++ b/src/security/intel/stm/Makefile
-@@ -18,6 +18,8 @@ all: build
-
- build:
- echo "STM - Build"
-+ echo "-- WARNING: This uses the system toolchain instead of"
-+ echo " the coreboot toolchain, so is not reproducible."
- cd $(project_dir)/Stm; \
- mkdir -p build; \
- cd build; \
---
-2.25.1
-
diff --git a/resources/coreboot/default/patches/0007-Makefile-Don-t-run-genbuild_h-if-not-doing-a-build.patch b/resources/coreboot/default/patches/0007-Makefile-Don-t-run-genbuild_h-if-not-doing-a-build.patch
deleted file mode 100644
index 6b7a4341..00000000
--- a/resources/coreboot/default/patches/0007-Makefile-Don-t-run-genbuild_h-if-not-doing-a-build.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 65f0c7278ec0c1cb197e3110e2bc4ebb4bd5caf4 Mon Sep 17 00:00:00 2001
-From: Martin Roth <martin@coreboot.org>
-Date: Sun, 9 May 2021 10:26:10 -0600
-Subject: [PATCH 07/19] Makefile: Don't run genbuild_h if not doing a build
-
-genbuild_h was being run on every make invocation - clean, distclean,
-etc. to get the source date epoch value. This value isn't used unless
-a build is being done, so don't run it on non-compile make invocations.
-
-Signed-off-by: Martin Roth <martin@coreboot.org>
-Change-Id: I2afc0affc17116e0db849ea968474bc19dbb0ae1
-Reviewed-on: https://review.coreboot.org/c/coreboot/+/53997
-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-Reviewed-by: Angel Pons <th3fanbus@gmail.com>
-Reviewed-by: Patrick Georgi <pgeorgi@google.com>
----
- Makefile | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index 8290b45e89..1e6cca44b3 100644
---- a/Makefile
-+++ b/Makefile
-@@ -24,7 +24,9 @@ COREBOOT_EXPORTS += top src srck obj objutil objk
- LANG:=C
- LC_ALL:=C
- TZ:=UTC0
-+ifneq ($(NOCOMPILE),1)
- SOURCE_DATE_EPOCH := $(shell $(top)/util/genbuild_h/genbuild_h.sh . | sed -n 's/^.define COREBOOT_BUILD_EPOCH\>.*"\(.*\)".*/\1/p')
-+endif
- # don't use COREBOOT_EXPORTS to ensure build steps outside the coreboot build system
- # are reproducible
- export LANG LC_ALL TZ SOURCE_DATE_EPOCH
---
-2.25.1
-
diff --git a/resources/coreboot/default/patches/0016-gigabyte-ga-g41m-es2l-set-VRAM-to-352MiB-by-default.patch b/resources/coreboot/default/patches/0007-gigabyte-ga-g41m-es2l-set-VRAM-to-352MiB-by-default.patch
index 0e0bab05..7992b023 100644
--- a/resources/coreboot/default/patches/0016-gigabyte-ga-g41m-es2l-set-VRAM-to-352MiB-by-default.patch
+++ b/resources/coreboot/default/patches/0007-gigabyte-ga-g41m-es2l-set-VRAM-to-352MiB-by-default.patch
@@ -1,7 +1,7 @@
-From 8b2eb25cdd1868e2e98eefa783e04b1797b1a701 Mon Sep 17 00:00:00 2001
+From 4f4f957ea967cc94841746821144ee807747f540 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Fri, 14 May 2021 13:18:26 +0100
-Subject: [PATCH 16/19] gigabyte/ga-g41m-es2l: set VRAM to 352MiB by default
+Subject: [PATCH 07/11] gigabyte/ga-g41m-es2l: set VRAM to 352MiB by default
---
src/mainboard/gigabyte/ga-g41m-es2l/cmos.default | 2 +-
diff --git a/resources/coreboot/default/patches/0017-acer-g43t-am3-set-VRAM-to-352MiB-by-default.patch b/resources/coreboot/default/patches/0008-acer-g43t-am3-set-VRAM-to-352MiB-by-default.patch
index 46ef21a6..1536c15f 100644
--- a/resources/coreboot/default/patches/0017-acer-g43t-am3-set-VRAM-to-352MiB-by-default.patch
+++ b/resources/coreboot/default/patches/0008-acer-g43t-am3-set-VRAM-to-352MiB-by-default.patch
@@ -1,7 +1,7 @@
-From f90a509e24ced459bc24ad9c34f363f9f413f558 Mon Sep 17 00:00:00 2001
+From 1ee893f9fc5251968500695824ab9fd39461d318 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Fri, 14 May 2021 13:21:39 +0100
-Subject: [PATCH 17/19] acer/g43t-am3: set VRAM to 352MiB by default
+Subject: [PATCH 08/11] acer/g43t-am3: set VRAM to 352MiB by default
---
src/mainboard/acer/g43t-am3/cmos.default | 2 +-
diff --git a/resources/coreboot/default/patches/0008-util-genbuild_h-Update-IASL-location-finding-code.patch b/resources/coreboot/default/patches/0008-util-genbuild_h-Update-IASL-location-finding-code.patch
deleted file mode 100644
index e8cd7117..00000000
--- a/resources/coreboot/default/patches/0008-util-genbuild_h-Update-IASL-location-finding-code.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From aba6235d16b87706357d0fdb35afaf52968fac53 Mon Sep 17 00:00:00 2001
-From: Martin Roth <martin@coreboot.org>
-Date: Sun, 9 May 2021 11:44:15 -0600
-Subject: [PATCH 08/19] util/genbuild_h: Update IASL location finding code
-
-Update the iasl path finding code to use XGCCPATH if it's set, and to
-look for iasl on the path if it's not set and not under util/crossgcc.
-
-On the jenkins builders, iasl is in the path, not in util/crossgcc/xgcc.
-
-On the systems of people who have multiple copies of coreboot, it makes
-sense to just have a single copy of the toolchain and define XGCCPATH in
-the environment to point to it.
-
-Previously, either of these situations resulted in a warning from the
-genbuild_h tool that iasl was not found under util/crossgcc, which was
-true, but not particularly relevant, and generated confusion.
-
-If xcompile already existed before make was run, the correct path would
-be found, but on an initial build, this check couldn't find iasl.
-
-BUG=None
-TEST=Build with iasl in /util/crossgcc/xgcc/bin, in the path and in a
-directory pointed to with XGCCPATH.
-
-Signed-off-by: Martin Roth <martin@coreboot.org>
-Change-Id: Ic2f8dca0be8bfb54d3c672fab6cf6f005bb394c3
-Reviewed-on: https://review.coreboot.org/c/coreboot/+/54001
-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-Reviewed-by: Angel Pons <th3fanbus@gmail.com>
-Reviewed-by: Patrick Georgi <pgeorgi@google.com>
----
- util/genbuild_h/genbuild_h.sh | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/util/genbuild_h/genbuild_h.sh b/util/genbuild_h/genbuild_h.sh
-index 10ca0c5fa3..c898fb6e3f 100755
---- a/util/genbuild_h/genbuild_h.sh
-+++ b/util/genbuild_h/genbuild_h.sh
-@@ -5,6 +5,7 @@
- DATE=""
- GITREV=""
- TIMESOURCE=""
-+XGCCPATH="${XGCCPATH:-util/crossgcc/xgcc/bin/}"
-
- export LANG=C
- export LC_ALL=C
-@@ -47,8 +48,15 @@ NetBSD|OpenBSD|DragonFly|FreeBSD|Darwin)
- esac
- }
-
--IASL=util/crossgcc/xgcc/bin/iasl
-+# Look for IASL in XGCCPATH and xcompile. Unfortunately,
-+# xcompile isn't available on the first build.
-+# If neither of those gives a valid iasl, check the path.
-+IASL="${XGCCPATH}iasl"
- eval $(grep ^IASL:= "$XCOMPILE" 2>/dev/null | sed s,:=,=,)
-+if [ ! -x "${IASL}" ]; then
-+ IASL=$(command -v iasl)
-+fi
-+IASLVERSION="$(${IASL} -v | grep version | sed 's/.*version //')" >/dev/null
-
- #Print out the information that goes into build.h
- printf "/* build system definitions (autogenerated) */\n"
-@@ -72,5 +80,5 @@ printf "#define COREBOOT_BUILD_EPOCH \"$(our_date "$DATE" +%s)\"\n"
- printf "#define COREBOOT_DMI_DATE \"$(our_date "$DATE" +%m/%d/%Y)\"\n"
- printf "\n"
- printf "#define COREBOOT_COMPILE_TIME \"$(our_date "$DATE" +%T)\"\n"
--printf "#define ASL_VERSION 0x%d\n" `$IASL -v | grep version | sed 's/.*version //'`
-+printf "#define ASL_VERSION 0x%d\n" "${IASLVERSION}"
- printf "#endif\n"
---
-2.25.1
-
diff --git a/resources/coreboot/default/patches/0018-Revert-cpu-intel-Configure-IA32_FEATURE_CONTROL-for-.patch b/resources/coreboot/default/patches/0009-Revert-cpu-intel-Configure-IA32_FEATURE_CONTROL-for-.patch
index ededc2c2..36f4778d 100644
--- a/resources/coreboot/default/patches/0018-Revert-cpu-intel-Configure-IA32_FEATURE_CONTROL-for-.patch
+++ b/resources/coreboot/default/patches/0009-Revert-cpu-intel-Configure-IA32_FEATURE_CONTROL-for-.patch
@@ -1,7 +1,7 @@
-From f2b62dca2238ec7782739e81490846673d754629 Mon Sep 17 00:00:00 2001
+From 8e8704050aec67490a6d1f272840e5a04ee1bcff Mon Sep 17 00:00:00 2001
From: Rodrigo <rm@firemail.cc>
Date: Mon, 23 Aug 2021 02:20:32 -0300
-Subject: [PATCH 18/19] Revert "cpu/intel: Configure IA32_FEATURE_CONTROL for
+Subject: [PATCH 09/11] Revert "cpu/intel: Configure IA32_FEATURE_CONTROL for
alternative SMRR"
This rendered at least the x200 unable to reboot.
@@ -30,10 +30,10 @@ index 3e4de1fa31..ca3ce274fc 100644
configure_c_states(quad);
diff --git a/src/cpu/intel/model_1067x/mp_init.c b/src/cpu/intel/model_1067x/mp_init.c
-index fd6a82ac17..e2fa7c8f20 100644
+index bc53214310..72f40f6762 100644
--- a/src/cpu/intel/model_1067x/mp_init.c
+++ b/src/cpu/intel/model_1067x/mp_init.c
-@@ -42,34 +42,8 @@ static void pre_mp_smm_init(void)
+@@ -43,34 +43,8 @@ static void pre_mp_smm_init(void)
smm_initialize();
}
@@ -83,7 +83,7 @@ index 278d8dea81..a0917045dd 100644
configure_c_states();
diff --git a/src/cpu/intel/model_6ex/model_6ex_init.c b/src/cpu/intel/model_6ex/model_6ex_init.c
-index 16c6866f45..31399bdbd7 100644
+index 34646ad5e9..36cfd51f01 100644
--- a/src/cpu/intel/model_6ex/model_6ex_init.c
+++ b/src/cpu/intel/model_6ex/model_6ex_init.c
@@ -109,6 +109,9 @@ static void model_6ex_init(struct device *cpu)
@@ -97,7 +97,7 @@ index 16c6866f45..31399bdbd7 100644
configure_c_states();
diff --git a/src/cpu/intel/model_6fx/model_6fx_init.c b/src/cpu/intel/model_6fx/model_6fx_init.c
-index d0987b4a63..17a865c9f3 100644
+index 72ece23935..6f2d6ef599 100644
--- a/src/cpu/intel/model_6fx/model_6fx_init.c
+++ b/src/cpu/intel/model_6fx/model_6fx_init.c
@@ -123,6 +123,9 @@ static void model_6fx_init(struct device *cpu)
diff --git a/resources/coreboot/default/patches/0009-util-crossgcc-Update-gmp-to-6.2.1.patch b/resources/coreboot/default/patches/0009-util-crossgcc-Update-gmp-to-6.2.1.patch
deleted file mode 100644
index f9190e2e..00000000
--- a/resources/coreboot/default/patches/0009-util-crossgcc-Update-gmp-to-6.2.1.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From f2c8d0323f4d2f1abc4dc0402bd871d9234850f3 Mon Sep 17 00:00:00 2001
-From: Patrick Georgi <pgeorgi@google.com>
-Date: Mon, 10 May 2021 23:34:18 +0200
-Subject: [PATCH 09/19] util/crossgcc: Update gmp to 6.2.1
-
-Change-Id: I871942f66e8fc496ebe523fdab539ea20950a202
-Signed-off-by: Patrick Georgi <pgeorgi@google.com>
-Reviewed-on: https://review.coreboot.org/c/coreboot/+/54047
-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
----
- util/crossgcc/buildgcc | 2 +-
- ...-6.2.0_generic-build.patch => gmp-6.2.1_generic-build.patch} | 0
- util/crossgcc/sum/gmp-6.2.0.tar.xz.cksum | 1 -
- util/crossgcc/sum/gmp-6.2.1.tar.xz.cksum | 1 +
- 4 files changed, 2 insertions(+), 2 deletions(-)
- rename util/crossgcc/patches/{gmp-6.2.0_generic-build.patch => gmp-6.2.1_generic-build.patch} (100%)
- delete mode 100644 util/crossgcc/sum/gmp-6.2.0.tar.xz.cksum
- create mode 100644 util/crossgcc/sum/gmp-6.2.1.tar.xz.cksum
-
-diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
-index c947dd45ab..d8f25dbbb8 100755
---- a/util/crossgcc/buildgcc
-+++ b/util/crossgcc/buildgcc
-@@ -32,7 +32,7 @@ BOOTSTRAP=0
- THREADS=1
-
- # GCC toolchain version numbers
--GMP_VERSION=6.2.0
-+GMP_VERSION=6.2.1
- MPFR_VERSION=4.1.0
- MPC_VERSION=1.2.0
- GCC_VERSION=8.3.0
-diff --git a/util/crossgcc/patches/gmp-6.2.0_generic-build.patch b/util/crossgcc/patches/gmp-6.2.1_generic-build.patch
-similarity index 100%
-rename from util/crossgcc/patches/gmp-6.2.0_generic-build.patch
-rename to util/crossgcc/patches/gmp-6.2.1_generic-build.patch
-diff --git a/util/crossgcc/sum/gmp-6.2.0.tar.xz.cksum b/util/crossgcc/sum/gmp-6.2.0.tar.xz.cksum
-deleted file mode 100644
-index b00b669fe7..0000000000
---- a/util/crossgcc/sum/gmp-6.2.0.tar.xz.cksum
-+++ /dev/null
-@@ -1 +0,0 @@
--052a5411dc74054240eec58132d2cf41211d0ff6 tarballs/gmp-6.2.0.tar.xz
-diff --git a/util/crossgcc/sum/gmp-6.2.1.tar.xz.cksum b/util/crossgcc/sum/gmp-6.2.1.tar.xz.cksum
-new file mode 100644
-index 0000000000..3ea4232e59
---- /dev/null
-+++ b/util/crossgcc/sum/gmp-6.2.1.tar.xz.cksum
-@@ -0,0 +1 @@
-+0578d48607ec0e272177d175fd1807c30b00fdf2 tarballs/gmp-6.2.1.tar.xz
---
-2.25.1
-
diff --git a/resources/coreboot/default/patches/0019-Fix-missing-include.patch b/resources/coreboot/default/patches/0010-Fix-missing-include.patch
index 372bb372..aaa3805c 100644
--- a/resources/coreboot/default/patches/0019-Fix-missing-include.patch
+++ b/resources/coreboot/default/patches/0010-Fix-missing-include.patch
@@ -1,7 +1,7 @@
-From 989abca57d4bcc2f7194a9dfb3a7fc67f62fbde3 Mon Sep 17 00:00:00 2001
+From e6960dec197491941254af48b60f1cf1592bcb2b Mon Sep 17 00:00:00 2001
From: Rodrigo <rm@firemail.cc>
Date: Mon, 23 Aug 2021 03:51:21 -0300
-Subject: [PATCH 19/19] Fix missing include
+Subject: [PATCH 10/11] Fix missing include
---
src/cpu/intel/model_1067x/model_1067x_init.c | 1 +
@@ -35,7 +35,7 @@ index a0917045dd..7b88f19ee0 100644
#define HIGHEST_CLEVEL 3
static void configure_c_states(void)
diff --git a/src/cpu/intel/model_6ex/model_6ex_init.c b/src/cpu/intel/model_6ex/model_6ex_init.c
-index 31399bdbd7..7347400766 100644
+index 36cfd51f01..793474ffa5 100644
--- a/src/cpu/intel/model_6ex/model_6ex_init.c
+++ b/src/cpu/intel/model_6ex/model_6ex_init.c
@@ -8,6 +8,7 @@
@@ -47,7 +47,7 @@ index 31399bdbd7..7347400766 100644
#define HIGHEST_CLEVEL 3
static void configure_c_states(void)
diff --git a/src/cpu/intel/model_6fx/model_6fx_init.c b/src/cpu/intel/model_6fx/model_6fx_init.c
-index 17a865c9f3..3b8a2f4708 100644
+index 6f2d6ef599..d0031ad741 100644
--- a/src/cpu/intel/model_6fx/model_6fx_init.c
+++ b/src/cpu/intel/model_6fx/model_6fx_init.c
@@ -8,6 +8,7 @@
diff --git a/resources/coreboot/default/patches/0010-util-crossgcc-Update-mpc-to-1.2.1.patch b/resources/coreboot/default/patches/0010-util-crossgcc-Update-mpc-to-1.2.1.patch
deleted file mode 100644
index 1b8f7168..00000000
--- a/resources/coreboot/default/patches/0010-util-crossgcc-Update-mpc-to-1.2.1.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 7237b72a6693c14ba51c798bc53873a4d8751d52 Mon Sep 17 00:00:00 2001
-From: Patrick Georgi <pgeorgi@google.com>
-Date: Mon, 10 May 2021 23:35:51 +0200
-Subject: [PATCH 10/19] util/crossgcc: Update mpc to 1.2.1
-
-Change-Id: Ic1422464d0a95c9cba1c417aaa05e4f1fe799d26
-Signed-off-by: Patrick Georgi <pgeorgi@google.com>
-Reviewed-on: https://review.coreboot.org/c/coreboot/+/54048
-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
----
- util/crossgcc/buildgcc | 2 +-
- util/crossgcc/sum/mpc-1.2.0.tar.gz.cksum | 1 -
- util/crossgcc/sum/mpc-1.2.1.tar.gz.cksum | 1 +
- 3 files changed, 2 insertions(+), 2 deletions(-)
- delete mode 100644 util/crossgcc/sum/mpc-1.2.0.tar.gz.cksum
- create mode 100644 util/crossgcc/sum/mpc-1.2.1.tar.gz.cksum
-
-diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
-index d8f25dbbb8..abe602c821 100755
---- a/util/crossgcc/buildgcc
-+++ b/util/crossgcc/buildgcc
-@@ -34,7 +34,7 @@ THREADS=1
- # GCC toolchain version numbers
- GMP_VERSION=6.2.1
- MPFR_VERSION=4.1.0
--MPC_VERSION=1.2.0
-+MPC_VERSION=1.2.1
- GCC_VERSION=8.3.0
- GCC_AUTOCONF_VERSION=2.69
- BINUTILS_VERSION=2.35.1
-diff --git a/util/crossgcc/sum/mpc-1.2.0.tar.gz.cksum b/util/crossgcc/sum/mpc-1.2.0.tar.gz.cksum
-deleted file mode 100644
-index ed98cc0298..0000000000
---- a/util/crossgcc/sum/mpc-1.2.0.tar.gz.cksum
-+++ /dev/null
-@@ -1 +0,0 @@
--0abdc94acab0c9bfdaa391347cdfd7bbdb1cf017 tarballs/mpc-1.2.0.tar.gz
-diff --git a/util/crossgcc/sum/mpc-1.2.1.tar.gz.cksum b/util/crossgcc/sum/mpc-1.2.1.tar.gz.cksum
-new file mode 100644
-index 0000000000..84254eb5af
---- /dev/null
-+++ b/util/crossgcc/sum/mpc-1.2.1.tar.gz.cksum
-@@ -0,0 +1 @@
-+2a4919abf445c6eda4e120cd669b8733ce337227 tarballs/mpc-1.2.1.tar.gz
---
-2.25.1
-
diff --git a/resources/coreboot/default/patches/0020-lenovo-t400-Enable-all-SATA-ports.patch b/resources/coreboot/default/patches/0011-lenovo-t400-Enable-all-SATA-ports.patch
index 5ca27c4d..dec2844e 100644
--- a/resources/coreboot/default/patches/0020-lenovo-t400-Enable-all-SATA-ports.patch
+++ b/resources/coreboot/default/patches/0011-lenovo-t400-Enable-all-SATA-ports.patch
@@ -1,7 +1,7 @@
-From 8027957b185313f2a9cecee21d14ae2c88407f5f Mon Sep 17 00:00:00 2001
+From c4ab3bd4c88d83ca3ca391519cec31fa7b7a6c2a Mon Sep 17 00:00:00 2001
From: persmule <persmule@gmail.com>
Date: Sun, 31 Oct 2021 23:33:26 +0000
-Subject: [PATCH 1/1] lenovo/t400: Enable all SATA ports
+Subject: [PATCH 11/11] lenovo/t400: Enable all SATA ports
There are 2 SATA ports on the chassis of t400(s), but at least one dock for
t400 contains a port for (P/S)ATA device, and t400s has a eSATA port on its
@@ -15,7 +15,7 @@ This patch unmasked all SATA ports found within t400s with factory firmware.
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mainboard/lenovo/t400/devicetree.cb b/src/mainboard/lenovo/t400/devicetree.cb
-index 5886aff48c..84cd4d87b1 100644
+index 670b4883f3..1fc60d9b24 100644
--- a/src/mainboard/lenovo/t400/devicetree.cb
+++ b/src/mainboard/lenovo/t400/devicetree.cb
@@ -59,8 +59,8 @@ chip northbridge/intel/gm45
diff --git a/resources/coreboot/default/patches/0011-tests-Enable-config-override-for-tests.patch b/resources/coreboot/default/patches/0011-tests-Enable-config-override-for-tests.patch
deleted file mode 100644
index 00d74e06..00000000
--- a/resources/coreboot/default/patches/0011-tests-Enable-config-override-for-tests.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From d654c14aa2f150d7b15abc89a3c267b24ca123a1 Mon Sep 17 00:00:00 2001
-From: Jakub Czapiga <jacz@semihalf.com>
-Date: Wed, 28 Apr 2021 16:50:51 +0200
-Subject: [PATCH 11/19] tests: Enable config override for tests
-
-Some tests require to change kconfig symbols values to cover the code.
-This patch enables one to set these vaues using <test-name>-config
-variable.
-
-Example for integer values.
-timestamp-test-config += CONFIG_HAVE_MONOTONIC_TIMER=1
-
-Example for string values. Notice escaped quotes.
-spd_cache-test-config += CONFIG_SPD_CACHE_FMAP_NAME=\"SPD_CACHE_FMAP_NAME\"
-
-Signed-off-by: Jakub Czapiga <jacz@semihalf.com>
-Change-Id: I1aeb78362c2609fbefbfd91c0f58ec19ed258ee1
-Reviewed-on: https://review.coreboot.org/c/coreboot/+/52937
-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>
-Reviewed-by: Julius Werner <jwerner@chromium.org>
----
- tests/Makefile.inc | 22 ++++++++++++++++++----
- 1 file changed, 18 insertions(+), 4 deletions(-)
-
-diff --git a/tests/Makefile.inc b/tests/Makefile.inc
-index 44e3c69618..cd25e0f809 100644
---- a/tests/Makefile.inc
-+++ b/tests/Makefile.inc
-@@ -11,7 +11,7 @@ CMAKE:= cmake
-
- TEST_DEFAULT_CONFIG = $(top)/configs/config.emulation_qemu_x86_i440fx
- TEST_DOTCONFIG = $(testobj)/.config
--TEST_KCONFIG_AUTOHEADER := $(testobj)/config.h
-+TEST_KCONFIG_AUTOHEADER := $(testobj)/config.src.h
- TEST_KCONFIG_AUTOCONFIG := $(testobj)/auto.conf
- TEST_KCONFIG_DEPENDENCIES := $(testobj)/auto.conf.cmd
- TEST_KCONFIG_SPLITCONFIG := $(testobj)/config
-@@ -52,7 +52,7 @@ TEST_CFLAGS += -fno-pie -fno-pic
- TEST_LDFLAGS += -no-pie
-
- # Extra attributes for unit tests, declared per test
--attributes:= srcs cflags mocks stage
-+attributes:= srcs cflags config mocks stage
-
- stages:= decompressor bootblock romstage smm verstage
- stages+= ramstage rmodule postcar libagesa
-@@ -83,9 +83,23 @@ $(call evaluate_subdirs)
- # Create actual targets for unit test binaries
- # $1 - test name
- define TEST_CC_template
--$($(1)-objs): TEST_CFLAGS+= \
-+
-+# Generate custom config.h redefining given symbols
-+$(1)-config-file := $(obj)/$(1)/config.h
-+$$($(1)-config-file): $(TEST_KCONFIG_AUTOHEADER)
-+ mkdir -p $$(dir $$@)
-+ printf '// File generated by tests/Makefile.inc\n// Do not change\n' > $$@
-+ printf '#include <%s>\n\n' "$(notdir $(TEST_KCONFIG_AUTOHEADER))" >> $$@
-+ for kv in $$($(1)-config); do \
-+ key="`echo $$$$kv | cut -d '=' -f -1`"; \
-+ value="`echo $$$$kv | cut -d '=' -f 2-`"; \
-+ printf '#undef %s\n' "$$$$key" >> $$@; \
-+ printf '#define %s %s\n\n' "$$$$key" "$$$$value" >> $$@; \
-+ done
-+
-+$($(1)-objs): TEST_CFLAGS += -I$$(dir $$($(1)-config-file)) \
- -D__$$(shell echo $$($(1)-stage) | tr '[:lower:]' '[:upper:]')__
--$($(1)-objs): $(obj)/$(1)/%.o: $$$$*.c $(TEST_KCONFIG_AUTOHEADER)
-+$($(1)-objs): $(obj)/$(1)/%.o: $$$$*.c $$($(1)-config-file)
- mkdir -p $$(dir $$@)
- $(HOSTCC) $(HOSTCFLAGS) $$(TEST_CFLAGS) $($(1)-cflags) -MMD \
- -MT $$@ -c $$< -o $$@
---
-2.25.1
-
diff --git a/resources/coreboot/default/patches/0012-src-Match-array-format-in-function-declarations-and-.patch b/resources/coreboot/default/patches/0012-src-Match-array-format-in-function-declarations-and-.patch
deleted file mode 100644
index 6079a668..00000000
--- a/resources/coreboot/default/patches/0012-src-Match-array-format-in-function-declarations-and-.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-From f92b7f3c5c9da178e2417333895fe735796e7954 Mon Sep 17 00:00:00 2001
-From: Patrick Georgi <pgeorgi@google.com>
-Date: Wed, 12 May 2021 14:52:12 +0200
-Subject: [PATCH 12/19] src: Match array format in function declarations and
- definitions
-
-gcc 11.1 complains when we're passing a type* into a function that was
-declared to get a type[], even if the ABI has identical parameter
-passing for both.
-
-To prepare for newer compilers, adapt to this added constraint.
-
-Change-Id: I5a1b3824a85a178431177620c4c0d5fddc993b4f
-Signed-off-by: Patrick Georgi <pgeorgi@google.com>
-Reviewed-on: https://review.coreboot.org/c/coreboot/+/54094
-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
-Reviewed-by: Felix Singer <felixsinger@posteo.net>
-Reviewed-by: Angel Pons <th3fanbus@gmail.com>
----
- src/mainboard/lenovo/t400/romstage.c | 2 +-
- src/mainboard/lenovo/x200/romstage.c | 2 +-
- src/mainboard/roda/rk9/romstage.c | 2 +-
- src/soc/intel/alderlake/espi.c | 2 +-
- src/soc/intel/cannonlake/lpc.c | 2 +-
- src/soc/intel/elkhartlake/espi.c | 2 +-
- src/soc/intel/icelake/espi.c | 2 +-
- src/soc/intel/jasperlake/espi.c | 2 +-
- src/soc/intel/skylake/lpc.c | 2 +-
- src/soc/intel/tigerlake/espi.c | 2 +-
- src/soc/intel/xeon_sp/lpc.c | 2 +-
- src/vendorcode/mediatek/mt8192/dramc/dramc_top.c | 2 +-
- 12 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/src/mainboard/lenovo/t400/romstage.c b/src/mainboard/lenovo/t400/romstage.c
-index b4766ed737..aa3462a901 100644
---- a/src/mainboard/lenovo/t400/romstage.c
-+++ b/src/mainboard/lenovo/t400/romstage.c
-@@ -15,7 +15,7 @@ static void hybrid_graphics_init(sysinfo_t *sysinfo)
- sysinfo->enable_peg = peg;
- }
-
--void get_mb_spd_addrmap(u8 *spd_addrmap)
-+void get_mb_spd_addrmap(u8 spd_addrmap[4])
- {
- spd_addrmap[0] = 0x50;
- spd_addrmap[2] = 0x51;
-diff --git a/src/mainboard/lenovo/x200/romstage.c b/src/mainboard/lenovo/x200/romstage.c
-index 46cedfb07f..6764644274 100644
---- a/src/mainboard/lenovo/x200/romstage.c
-+++ b/src/mainboard/lenovo/x200/romstage.c
-@@ -3,7 +3,7 @@
- #include <southbridge/intel/common/gpio.h>
- #include <northbridge/intel/gm45/gm45.h>
-
--void get_mb_spd_addrmap(u8 *spd_addrmap)
-+void get_mb_spd_addrmap(u8 spd_addrmap[4])
- {
- spd_addrmap[0] = 0x50;
- spd_addrmap[2] = 0x51;
-diff --git a/src/mainboard/roda/rk9/romstage.c b/src/mainboard/roda/rk9/romstage.c
-index be8ba5dbb3..dabef34707 100644
---- a/src/mainboard/roda/rk9/romstage.c
-+++ b/src/mainboard/roda/rk9/romstage.c
-@@ -2,7 +2,7 @@
-
- #include <northbridge/intel/gm45/gm45.h>
-
--void get_mb_spd_addrmap(u8 *spd_addrmap)
-+void get_mb_spd_addrmap(u8 spd_addrmap[4])
- {
- spd_addrmap[0] = 0x50;
- spd_addrmap[2] = 0x52;
-diff --git a/src/soc/intel/alderlake/espi.c b/src/soc/intel/alderlake/espi.c
-index feec465a92..dd0edcde2c 100644
---- a/src/soc/intel/alderlake/espi.c
-+++ b/src/soc/intel/alderlake/espi.c
-@@ -20,7 +20,7 @@
- #include <soc/pcr_ids.h>
- #include <soc/soc_chip.h>
-
--void soc_get_gen_io_dec_range(uint32_t *gen_io_dec)
-+void soc_get_gen_io_dec_range(uint32_t gen_io_dec[LPC_NUM_GENERIC_IO_RANGES])
- {
- const config_t *config = config_of_soc();
-
-diff --git a/src/soc/intel/cannonlake/lpc.c b/src/soc/intel/cannonlake/lpc.c
-index 20704e5bc6..0e63e0dc97 100644
---- a/src/soc/intel/cannonlake/lpc.c
-+++ b/src/soc/intel/cannonlake/lpc.c
-@@ -17,7 +17,7 @@
-
- #include "chip.h"
-
--void soc_get_gen_io_dec_range(uint32_t *gen_io_dec)
-+void soc_get_gen_io_dec_range(uint32_t gen_io_dec[LPC_NUM_GENERIC_IO_RANGES])
- {
- const config_t *config = config_of_soc();
-
-diff --git a/src/soc/intel/elkhartlake/espi.c b/src/soc/intel/elkhartlake/espi.c
-index 1737a474ac..46646d8485 100644
---- a/src/soc/intel/elkhartlake/espi.c
-+++ b/src/soc/intel/elkhartlake/espi.c
-@@ -16,7 +16,7 @@
- #include <soc/pcr_ids.h>
- #include <soc/soc_chip.h>
-
--void soc_get_gen_io_dec_range(uint32_t *gen_io_dec)
-+void soc_get_gen_io_dec_range(uint32_t gen_io_dec[LPC_NUM_GENERIC_IO_RANGES])
- {
- const config_t *config = config_of_soc();
-
-diff --git a/src/soc/intel/icelake/espi.c b/src/soc/intel/icelake/espi.c
-index 489fe34223..d634cf8943 100644
---- a/src/soc/intel/icelake/espi.c
-+++ b/src/soc/intel/icelake/espi.c
-@@ -16,7 +16,7 @@
- #include <soc/pcr_ids.h>
- #include <soc/soc_chip.h>
-
--void soc_get_gen_io_dec_range(uint32_t *gen_io_dec)
-+void soc_get_gen_io_dec_range(uint32_t gen_io_dec[LPC_NUM_GENERIC_IO_RANGES])
- {
- const config_t *config = config_of_soc();
-
-diff --git a/src/soc/intel/jasperlake/espi.c b/src/soc/intel/jasperlake/espi.c
-index c3b50de8f0..1d1f94e328 100644
---- a/src/soc/intel/jasperlake/espi.c
-+++ b/src/soc/intel/jasperlake/espi.c
-@@ -16,7 +16,7 @@
- #include <soc/pcr_ids.h>
- #include <soc/soc_chip.h>
-
--void soc_get_gen_io_dec_range(uint32_t *gen_io_dec)
-+void soc_get_gen_io_dec_range(uint32_t gen_io_dec[LPC_NUM_GENERIC_IO_RANGES])
- {
- const config_t *config = config_of_soc();
-
-diff --git a/src/soc/intel/skylake/lpc.c b/src/soc/intel/skylake/lpc.c
-index 5abae765c9..5d38bb8683 100644
---- a/src/soc/intel/skylake/lpc.c
-+++ b/src/soc/intel/skylake/lpc.c
-@@ -14,7 +14,7 @@
-
- #include "chip.h"
-
--void soc_get_gen_io_dec_range(uint32_t *gen_io_dec)
-+void soc_get_gen_io_dec_range(uint32_t gen_io_dec[LPC_NUM_GENERIC_IO_RANGES])
- {
- const config_t *config = config_of_soc();
-
-diff --git a/src/soc/intel/tigerlake/espi.c b/src/soc/intel/tigerlake/espi.c
-index 8386cd9df1..427867622b 100644
---- a/src/soc/intel/tigerlake/espi.c
-+++ b/src/soc/intel/tigerlake/espi.c
-@@ -22,7 +22,7 @@
- #include <soc/pcr_ids.h>
- #include <soc/soc_chip.h>
-
--void soc_get_gen_io_dec_range(uint32_t *gen_io_dec)
-+void soc_get_gen_io_dec_range(uint32_t gen_io_dec[LPC_NUM_GENERIC_IO_RANGES])
- {
- const config_t *config = config_of_soc();
-
-diff --git a/src/soc/intel/xeon_sp/lpc.c b/src/soc/intel/xeon_sp/lpc.c
-index f0cb6db63d..dad0a4914d 100644
---- a/src/soc/intel/xeon_sp/lpc.c
-+++ b/src/soc/intel/xeon_sp/lpc.c
-@@ -8,7 +8,7 @@
-
- #include <chip.h>
-
--void soc_get_gen_io_dec_range(uint32_t *gen_io_dec)
-+void soc_get_gen_io_dec_range(uint32_t gen_io_dec[LPC_NUM_GENERIC_IO_RANGES])
- {
- const config_t *config = config_of_soc();
-
-diff --git a/src/vendorcode/mediatek/mt8192/dramc/dramc_top.c b/src/vendorcode/mediatek/mt8192/dramc/dramc_top.c
-index 8af6a36851..04fd62a27f 100644
---- a/src/vendorcode/mediatek/mt8192/dramc/dramc_top.c
-+++ b/src/vendorcode/mediatek/mt8192/dramc/dramc_top.c
-@@ -475,7 +475,7 @@ int get_dram_freq_cnt(void)
- #if (FOR_DV_SIMULATION_USED==0)
- #if !__FLASH_TOOL_DA__ && !__ETT__
-
--void get_dram_rank_size(u64 dram_rank_size[DRAMC_MAX_RK])
-+void get_dram_rank_size(u64 dram_rank_size[])
- {
- #ifdef COMBO_MCP
- int index, rank_nr, i;
---
-2.25.1
-
diff --git a/resources/coreboot/default/patches/0013-src-security-tpm-Deal-with-zero-length-tlcl-writes.patch b/resources/coreboot/default/patches/0013-src-security-tpm-Deal-with-zero-length-tlcl-writes.patch
deleted file mode 100644
index 4f3bff48..00000000
--- a/resources/coreboot/default/patches/0013-src-security-tpm-Deal-with-zero-length-tlcl-writes.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 6c9fe645f8444bd4586e26b545cc9dceb162f03a Mon Sep 17 00:00:00 2001
-From: Patrick Georgi <pgeorgi@google.com>
-Date: Wed, 12 May 2021 14:54:49 +0200
-Subject: [PATCH 13/19] src/security/tpm: Deal with zero length tlcl writes
-
-While memcpy(foo, bar, 0) should be a no-op, that's hard to prove for a
-compiler and so gcc 11.1 complains about the use of an uninitialized
-"bar" even though it's harmless in this case.
-
-Change-Id: Idbffa508c2cd68790efbc0b4ab97ae1b4d85ad51
-Signed-off-by: Patrick Georgi <pgeorgi@google.com>
-Reviewed-on: https://review.coreboot.org/c/coreboot/+/54095
-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-Reviewed-by: Jacob Garber <jgarber1@ualberta.ca>
-Reviewed-by: Angel Pons <th3fanbus@gmail.com>
----
- src/security/tpm/tss/tcg-1.2/tss.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/security/tpm/tss/tcg-1.2/tss.c b/src/security/tpm/tss/tcg-1.2/tss.c
-index 8b7778ddb2..413b68193f 100644
---- a/src/security/tpm/tss/tcg-1.2/tss.c
-+++ b/src/security/tpm/tss/tcg-1.2/tss.c
-@@ -215,7 +215,8 @@ uint32_t tlcl_write(uint32_t index, const void *data, uint32_t length)
-
- to_tpm_uint32(cmd.buffer + tpm_nv_write_cmd.index, index);
- to_tpm_uint32(cmd.buffer + tpm_nv_write_cmd.length, length);
-- memcpy(cmd.buffer + tpm_nv_write_cmd.data, data, length);
-+ if (length > 0)
-+ memcpy(cmd.buffer + tpm_nv_write_cmd.data, data, length);
-
- return tlcl_send_receive(cmd.buffer, response, sizeof(response));
- }
---
-2.25.1
-
diff --git a/resources/coreboot/fam15h_rdimm/board.cfg b/resources/coreboot/fam15h_rdimm/board.cfg
index 6c965355..b1b7c28f 100644
--- a/resources/coreboot/fam15h_rdimm/board.cfg
+++ b/resources/coreboot/fam15h_rdimm/board.cfg
@@ -4,7 +4,5 @@ cbrevision="ad983eeec76ecdb2aff4fb47baeee95ade012225"
arch="x86_64"
payload_grub="n"
payload_grub_withseabios="n"
-payload_grub_withtianocore="n"
payload_seabios="n"
-payload_tianocore="n"
payload_memtest="n"
diff --git a/resources/coreboot/fam15h_udimm/board.cfg b/resources/coreboot/fam15h_udimm/board.cfg
index 2fd0da52..850ac1d2 100644
--- a/resources/coreboot/fam15h_udimm/board.cfg
+++ b/resources/coreboot/fam15h_udimm/board.cfg
@@ -4,7 +4,5 @@ cbrevision="ad983eeec76ecdb2aff4fb47baeee95ade012225"
arch="x86_64"
payload_grub="n"
payload_grub_withseabios="n"
-payload_grub_withtianocore="n"
payload_seabios="n"
-payload_tianocore="n"
payload_memtest="n"
diff --git a/resources/coreboot/g43t-am3/board.cfg b/resources/coreboot/g43t-am3/board.cfg
index dd75ef49..df74b20e 100644
--- a/resources/coreboot/g43t-am3/board.cfg
+++ b/resources/coreboot/g43t-am3/board.cfg
@@ -3,6 +3,4 @@ romtype="normal"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
diff --git a/resources/coreboot/g43t-am3/config/libgfxinit_txtmode b/resources/coreboot/g43t-am3/config/libgfxinit_txtmode
index ac059e9c..95d7aa0d 100644
--- a/resources/coreboot/g43t-am3/config/libgfxinit_txtmode
+++ b/resources/coreboot/g43t-am3/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -119,25 +118,19 @@ CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
CONFIG_POST_DEVICE=y
-# CONFIG_BOARD_EMULATION_QEMU_AARCH64 is not set
-# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
-# CONFIG_BOARD_EMULATION_QEMU_POWER8 is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
-# CONFIG_BOARD_EMULATION_QEMU_RISCV_RV64 is not set
-# CONFIG_BOARD_EMULATION_QEMU_RISCV_RV32 is not set
-# CONFIG_BOARD_EMULATION_SPIKE_RISCV is not set
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
CONFIG_DCACHE_RAM_BASE=0xfeff8000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xe0000000
-CONFIG_MMCONF_BUS_NUMBER=256
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
@@ -146,15 +139,14 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-CONFIG_PCIEXP_HOTPLUG=y
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="G43T-AM3"
+# CONFIG_HAVE_IFD_BIN is not set
CONFIG_PCIEXP_HOTPLUG_BUSES=32
CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
-CONFIG_CBFS_MCACHE_SIZE=0x2000
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="G43T-AM3"
-# CONFIG_HAVE_IFD_BIN is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
+CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
CONFIG_PCIEXP_CLK_PM=y
CONFIG_DRIVERS_UART_8250IO=y
@@ -181,11 +173,7 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
-# CONFIG_SYSTEM_TYPE_LAPTOP is not set
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
+# end of Mainboard
#
# Chipset
@@ -194,58 +182,36 @@ CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
+CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-CONFIG_PCIEXP_ASPM=y
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+CONFIG_PCIEXP_ASPM=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_MODEL_F3X=y
@@ -253,8 +219,6 @@ CONFIG_CPU_INTEL_MODEL_F4X=y
CONFIG_SOCKET_SPECIFIC_OPTIONS=y
CONFIG_SSE2=y
CONFIG_CPU_INTEL_SOCKET_LGA775=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -262,35 +226,24 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_CPU_QEMU_X86_LAPIC_INIT is not set
-# CONFIG_CPU_QEMU_X86_PARALLEL_MP is not set
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -299,35 +252,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_X4X=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
+CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801JX=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -340,10 +284,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_ITE_COMMON_PRE_RAM=y
CONFIG_SUPERIO_ITE_ENV_CTRL=y
CONFIG_SUPERIO_ITE_ENV_CTRL_FAN16_CONFIG=y
@@ -353,28 +293,11 @@ CONFIG_SUPERIO_ITE_IT8720F=y
#
# Embedded Controllers
#
-# CONFIG_EC_51NB_NPCE985LA0DX is not set
-# CONFIG_EC_GOOGLE_CHROMEEC_SKUID is not set
-# CONFIG_EC_GOOGLE_WILCO is not set
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -382,61 +305,47 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
+CONFIG_HAVE_EXP_X86_64_SUPPORT=y
+# CONFIG_USE_EXP_X86_64_SUPPORT is not set
CONFIG_AP_IN_SIPI_WAIT=y
CONFIG_SIPI_VECTOR_IN_ROM=y
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
-# CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT is not set
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x10000000
+CONFIG_ECAM_MMCONF_LENGTH=0x10000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -449,38 +358,21 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM is not set
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
-# CONFIG_HAS_RECOVERY_MRC_CACHE is not set
-# CONFIG_MRC_SETTINGS_VARIABLE_DATA is not set
-# CONFIG_MRC_WRITE_NV_LATE is not set
CONFIG_MRC_STASH_TO_CBMEM=y
-# 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY is not set
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -491,96 +383,31 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
CONFIG_DRIVERS_I2C_CK505=y
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 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_SSC_ALTERNATE_REF is not set
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
-# CONFIG_GFX_GMA_PANEL_1_ON_LVDS is not set
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP 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_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -589,31 +416,34 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -656,32 +486,23 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
-# CONFIG_GENERATE_MP_TABLE is not set
-# 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"
+# end of System tables
#
# Payload
@@ -697,15 +518,8 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_YABITS is not set
# CONFIG_PAYLOAD_LINUX is not set
# CONFIG_PAYLOAD_TIANOCORE is not set
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
-# CONFIG_SEABIOS_REVISION is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_COMPRESSED_PAYLOAD_NONE is not set
-# CONFIG_COMPRESSED_PAYLOAD_LZMA is not set
-# CONFIG_COMPRESSED_PAYLOAD_LZ4 is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -715,6 +529,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -723,6 +539,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -739,30 +556,20 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xe0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/g43t-am3_16mb/board.cfg b/resources/coreboot/g43t-am3_16mb/board.cfg
index ff15c45f..6d02fbf6 100644
--- a/resources/coreboot/g43t-am3_16mb/board.cfg
+++ b/resources/coreboot/g43t-am3_16mb/board.cfg
@@ -3,7 +3,5 @@ romtype="normal"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/g43t-am3_16mb/config/libgfxinit_txtmode b/resources/coreboot/g43t-am3_16mb/config/libgfxinit_txtmode
index 4554b079..cdd3d79f 100644
--- a/resources/coreboot/g43t-am3_16mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/g43t-am3_16mb/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -119,6 +118,8 @@ CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -128,8 +129,8 @@ CONFIG_DCACHE_RAM_BASE=0xfeff8000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xe0000000
-CONFIG_MMCONF_BUS_NUMBER=256
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
@@ -138,15 +139,14 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-CONFIG_PCIEXP_HOTPLUG=y
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="G43T-AM3"
+# CONFIG_HAVE_IFD_BIN is not set
CONFIG_PCIEXP_HOTPLUG_BUSES=32
CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
-CONFIG_CBFS_MCACHE_SIZE=0x2000
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="G43T-AM3"
-# CONFIG_HAVE_IFD_BIN is not set
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
+CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
CONFIG_PCIEXP_CLK_PM=y
CONFIG_DRIVERS_UART_8250IO=y
@@ -173,11 +173,7 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
-# CONFIG_SYSTEM_TYPE_LAPTOP is not set
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
+# end of Mainboard
#
# Chipset
@@ -186,58 +182,36 @@ CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
+CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-CONFIG_PCIEXP_ASPM=y
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+CONFIG_PCIEXP_ASPM=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_MODEL_F3X=y
@@ -245,8 +219,6 @@ CONFIG_CPU_INTEL_MODEL_F4X=y
CONFIG_SOCKET_SPECIFIC_OPTIONS=y
CONFIG_SSE2=y
CONFIG_CPU_INTEL_SOCKET_LGA775=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -254,33 +226,24 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -289,35 +252,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_X4X=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
+CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801JX=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -330,10 +284,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_ITE_COMMON_PRE_RAM=y
CONFIG_SUPERIO_ITE_ENV_CTRL=y
CONFIG_SUPERIO_ITE_ENV_CTRL_FAN16_CONFIG=y
@@ -343,28 +293,11 @@ CONFIG_SUPERIO_ITE_IT8720F=y
#
# Embedded Controllers
#
-# CONFIG_EC_51NB_NPCE985LA0DX is not set
-# CONFIG_EC_GOOGLE_CHROMEEC_SKUID is not set
-# CONFIG_EC_GOOGLE_WILCO is not set
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -372,60 +305,47 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
+CONFIG_HAVE_EXP_X86_64_SUPPORT=y
+# CONFIG_USE_EXP_X86_64_SUPPORT is not set
CONFIG_AP_IN_SIPI_WAIT=y
CONFIG_SIPI_VECTOR_IN_ROM=y
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x10000000
+CONFIG_ECAM_MMCONF_LENGTH=0x10000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -438,38 +358,21 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM is not set
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
-# CONFIG_HAS_RECOVERY_MRC_CACHE is not set
-# CONFIG_MRC_SETTINGS_VARIABLE_DATA is not set
-# CONFIG_MRC_WRITE_NV_LATE is not set
CONFIG_MRC_STASH_TO_CBMEM=y
-# 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY is not set
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -480,96 +383,31 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
CONFIG_DRIVERS_I2C_CK505=y
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 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_SSC_ALTERNATE_REF is not set
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
-# CONFIG_GFX_GMA_PANEL_1_ON_LVDS is not set
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP 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_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -578,31 +416,34 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -645,32 +486,23 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
-# CONFIG_GENERATE_MP_TABLE is not set
-# 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"
+# end of System tables
#
# Payload
@@ -688,7 +520,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -698,6 +529,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -706,6 +539,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -722,30 +556,20 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xe0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/ga-g41m-es2l/board.cfg b/resources/coreboot/ga-g41m-es2l/board.cfg
index dd75ef49..df74b20e 100644
--- a/resources/coreboot/ga-g41m-es2l/board.cfg
+++ b/resources/coreboot/ga-g41m-es2l/board.cfg
@@ -3,6 +3,4 @@ romtype="normal"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
diff --git a/resources/coreboot/ga-g41m-es2l/config/libgfxinit_txtmode b/resources/coreboot/ga-g41m-es2l/config/libgfxinit_txtmode
index a6867c97..37cb2784 100644
--- a/resources/coreboot/ga-g41m-es2l/config/libgfxinit_txtmode
+++ b/resources/coreboot/ga-g41m-es2l/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -118,25 +117,19 @@ CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
CONFIG_POST_DEVICE=y
-# CONFIG_BOARD_EMULATION_QEMU_AARCH64 is not set
-# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
-# CONFIG_BOARD_EMULATION_QEMU_POWER8 is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
-# CONFIG_BOARD_EMULATION_QEMU_RISCV_RV64 is not set
-# CONFIG_BOARD_EMULATION_QEMU_RISCV_RV32 is not set
-# CONFIG_BOARD_EMULATION_SPIKE_RISCV is not set
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
CONFIG_DCACHE_RAM_BASE=0xfeff8000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xe0000000
-CONFIG_MMCONF_BUS_NUMBER=256
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=256
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
@@ -154,11 +147,10 @@ CONFIG_BOARD_GIGABYTE_GA_G41M_ES2L=y
# CONFIG_BOARD_GIGABYTE_GA_H61MA_D3V is not set
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
-CONFIG_CBFS_MCACHE_SIZE=0x2000
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="GA-G41M-ES2L"
CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
+CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_PCIEXP_L1_SUB_STATE=y
CONFIG_PCIEXP_CLK_PM=y
CONFIG_DRIVERS_UART_8250IO=y
@@ -185,11 +177,7 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
-# CONFIG_SYSTEM_TYPE_LAPTOP is not set
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
+# end of Mainboard
#
# Chipset
@@ -198,61 +186,39 @@ CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
+CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-CONFIG_PCIEXP_ASPM=y
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=3
+CONFIG_PCIEXP_ASPM=y
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
CONFIG_INTEL_HAS_TOP_SWAP=y
# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set
CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_MODEL_F3X=y
@@ -260,8 +226,6 @@ CONFIG_CPU_INTEL_MODEL_F4X=y
CONFIG_SOCKET_SPECIFIC_OPTIONS=y
CONFIG_SSE2=y
CONFIG_CPU_INTEL_SOCKET_LGA775=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -269,35 +233,24 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_CPU_QEMU_X86_LAPIC_INIT is not set
-# CONFIG_CPU_QEMU_X86_PARALLEL_MP is not set
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -306,37 +259,30 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_X4X=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7=y
-# 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=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE is not set
CONFIG_INTEL_CHIPSET_LOCKDOWN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_WATCHDOG=y
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -346,10 +292,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_ITE_COMMON_PRE_RAM=y
CONFIG_SUPERIO_ITE_ENV_CTRL=y
CONFIG_SUPERIO_ITE_ENV_CTRL_FAN16_CONFIG=y
@@ -359,18 +301,6 @@ CONFIG_SUPERIO_ITE_IT8718F=y
#
# Embedded Controllers
#
-# CONFIG_EC_51NB_NPCE985LA0DX is not set
-# CONFIG_EC_GOOGLE_CHROMEEC_SKUID is not set
-# CONFIG_EC_GOOGLE_WILCO is not set
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -378,61 +308,47 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
+CONFIG_HAVE_EXP_X86_64_SUPPORT=y
+# CONFIG_USE_EXP_X86_64_SUPPORT is not set
CONFIG_AP_IN_SIPI_WAIT=y
CONFIG_SIPI_VECTOR_IN_ROM=y
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
-# CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT is not set
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x10000000
+CONFIG_ECAM_MMCONF_LENGTH=0x10000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -442,40 +358,23 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM is not set
CONFIG_CACHE_MRC_SETTINGS=y
# CONFIG_MRC_SETTINGS_PROTECT is not set
-# CONFIG_HAS_RECOVERY_MRC_CACHE is not set
-# CONFIG_MRC_SETTINGS_VARIABLE_DATA is not set
-# CONFIG_MRC_WRITE_NV_LATE is not set
CONFIG_MRC_STASH_TO_CBMEM=y
CONFIG_REALTEK_8168_RESET=y
CONFIG_REALTEK_8168_MACADDRESS="00:e0:4c:00:c0:b0"
-# 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY is not set
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -486,95 +385,29 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
-# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 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_SSC_ALTERNATE_REF is not set
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
-# CONFIG_GFX_GMA_PANEL_1_ON_LVDS is not set
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP 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_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -583,32 +416,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -651,32 +487,23 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
-# CONFIG_GENERATE_MP_TABLE is not set
-# 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"
+# end of System tables
#
# Payload
@@ -692,15 +519,8 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_YABITS is not set
# CONFIG_PAYLOAD_LINUX is not set
# CONFIG_PAYLOAD_TIANOCORE is not set
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
-# CONFIG_SEABIOS_REVISION is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_COMPRESSED_PAYLOAD_NONE is not set
-# CONFIG_COMPRESSED_PAYLOAD_LZMA is not set
-# CONFIG_COMPRESSED_PAYLOAD_LZ4 is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -710,6 +530,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -718,6 +540,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -734,30 +557,20 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xe0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/kcma-d8-rdimm_16mb/board.cfg b/resources/coreboot/kcma-d8-rdimm_16mb/board.cfg
index e2787464..ced4feb4 100644
--- a/resources/coreboot/kcma-d8-rdimm_16mb/board.cfg
+++ b/resources/coreboot/kcma-d8-rdimm_16mb/board.cfg
@@ -3,7 +3,5 @@ romtype="d8d16sas"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/kcma-d8-rdimm_16mb/config/libgfxinit_txtmode b/resources/coreboot/kcma-d8-rdimm_16mb/config/libgfxinit_txtmode
index 03d2b585..bfb039c2 100644
--- a/resources/coreboot/kcma-d8-rdimm_16mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/kcma-d8-rdimm_16mb/config/libgfxinit_txtmode
@@ -413,11 +413,9 @@ CONFIG_COLLECT_TIMESTAMPS_TSC=y
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
+CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT=y
# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
-# CONFIG_VGA_ROM_RUN is not set
-# CONFIG_NO_GFX_INIT is not set
# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
diff --git a/resources/coreboot/kcma-d8-rdimm_2mb/board.cfg b/resources/coreboot/kcma-d8-rdimm_2mb/board.cfg
index e2787464..ced4feb4 100644
--- a/resources/coreboot/kcma-d8-rdimm_2mb/board.cfg
+++ b/resources/coreboot/kcma-d8-rdimm_2mb/board.cfg
@@ -3,7 +3,5 @@ romtype="d8d16sas"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/kcma-d8-rdimm_2mb/config/libgfxinit_txtmode b/resources/coreboot/kcma-d8-rdimm_2mb/config/libgfxinit_txtmode
index 93bf5a3a..acebd390 100644
--- a/resources/coreboot/kcma-d8-rdimm_2mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/kcma-d8-rdimm_2mb/config/libgfxinit_txtmode
@@ -143,14 +143,6 @@ CONFIG_MAX_REBOOT_CNT=10
CONFIG_OVERRIDE_DEVICETREE=""
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_FMDFILE=""
-# CONFIG_BOARD_EMULATION_QEMU_AARCH64 is not set
-# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
-# CONFIG_BOARD_EMULATION_QEMU_POWER8 is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
-# CONFIG_BOARD_EMULATION_QEMU_RISCV_RV64 is not set
-# CONFIG_BOARD_EMULATION_QEMU_RISCV_RV32 is not set
-# CONFIG_BOARD_EMULATION_SPIKE_RISCV is not set
# CONFIG_VBOOT is not set
CONFIG_MMCONF_BASE_ADDRESS=0xc0000000
CONFIG_POST_DEVICE=y
@@ -421,11 +413,9 @@ CONFIG_COLLECT_TIMESTAMPS_TSC=y
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
+CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT=y
# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
-# CONFIG_VGA_ROM_RUN is not set
-# CONFIG_NO_GFX_INIT is not set
# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
@@ -549,8 +539,6 @@ CONFIG_VGA=y
# Trusted Platform Module
#
CONFIG_USER_NO_TPM=y
-# CONFIG_USER_TPM1 is not set
-# CONFIG_USER_TPM2 is not set
#
# Memory initialization
@@ -647,13 +635,8 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_YABITS is not set
# CONFIG_PAYLOAD_LINUX is not set
# CONFIG_PAYLOAD_TIANOCORE is not set
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
-# CONFIG_SEABIOS_REVISION is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_COMPRESSED_PAYLOAD_LZMA is not set
-# CONFIG_COMPRESSED_PAYLOAD_LZ4 is not set
# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
diff --git a/resources/coreboot/kcma-d8-udimm_16mb/board.cfg b/resources/coreboot/kcma-d8-udimm_16mb/board.cfg
index c87828c7..90caa033 100644
--- a/resources/coreboot/kcma-d8-udimm_16mb/board.cfg
+++ b/resources/coreboot/kcma-d8-udimm_16mb/board.cfg
@@ -3,7 +3,5 @@ romtype="d8d16sas"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/kcma-d8-udimm_16mb/config/libgfxinit_txtmode b/resources/coreboot/kcma-d8-udimm_16mb/config/libgfxinit_txtmode
index 03d2b585..bfb039c2 100644
--- a/resources/coreboot/kcma-d8-udimm_16mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/kcma-d8-udimm_16mb/config/libgfxinit_txtmode
@@ -413,11 +413,9 @@ CONFIG_COLLECT_TIMESTAMPS_TSC=y
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
+CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT=y
# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
-# CONFIG_VGA_ROM_RUN is not set
-# CONFIG_NO_GFX_INIT is not set
# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
diff --git a/resources/coreboot/kcma-d8-udimm_2mb/board.cfg b/resources/coreboot/kcma-d8-udimm_2mb/board.cfg
index c87828c7..90caa033 100644
--- a/resources/coreboot/kcma-d8-udimm_2mb/board.cfg
+++ b/resources/coreboot/kcma-d8-udimm_2mb/board.cfg
@@ -3,7 +3,5 @@ romtype="d8d16sas"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/kcma-d8-udimm_2mb/config/libgfxinit_txtmode b/resources/coreboot/kcma-d8-udimm_2mb/config/libgfxinit_txtmode
index 93bf5a3a..acebd390 100644
--- a/resources/coreboot/kcma-d8-udimm_2mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/kcma-d8-udimm_2mb/config/libgfxinit_txtmode
@@ -143,14 +143,6 @@ CONFIG_MAX_REBOOT_CNT=10
CONFIG_OVERRIDE_DEVICETREE=""
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_FMDFILE=""
-# CONFIG_BOARD_EMULATION_QEMU_AARCH64 is not set
-# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
-# CONFIG_BOARD_EMULATION_QEMU_POWER8 is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
-# CONFIG_BOARD_EMULATION_QEMU_RISCV_RV64 is not set
-# CONFIG_BOARD_EMULATION_QEMU_RISCV_RV32 is not set
-# CONFIG_BOARD_EMULATION_SPIKE_RISCV is not set
# CONFIG_VBOOT is not set
CONFIG_MMCONF_BASE_ADDRESS=0xc0000000
CONFIG_POST_DEVICE=y
@@ -421,11 +413,9 @@ CONFIG_COLLECT_TIMESTAMPS_TSC=y
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
+CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT=y
# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
-# CONFIG_VGA_ROM_RUN is not set
-# CONFIG_NO_GFX_INIT is not set
# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
@@ -549,8 +539,6 @@ CONFIG_VGA=y
# Trusted Platform Module
#
CONFIG_USER_NO_TPM=y
-# CONFIG_USER_TPM1 is not set
-# CONFIG_USER_TPM2 is not set
#
# Memory initialization
@@ -647,13 +635,8 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_YABITS is not set
# CONFIG_PAYLOAD_LINUX is not set
# CONFIG_PAYLOAD_TIANOCORE is not set
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
-# CONFIG_SEABIOS_REVISION is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_COMPRESSED_PAYLOAD_LZMA is not set
-# CONFIG_COMPRESSED_PAYLOAD_LZ4 is not set
# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
diff --git a/resources/coreboot/kfsn4-dre_1mb/board.cfg b/resources/coreboot/kfsn4-dre_1mb/board.cfg
index b7079280..c8686606 100644
--- a/resources/coreboot/kfsn4-dre_1mb/board.cfg
+++ b/resources/coreboot/kfsn4-dre_1mb/board.cfg
@@ -3,7 +3,5 @@ romtype="normal"
arch="x86_64"
payload_grub="n"
payload_grub_withseabios="n"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/kfsn4-dre_1mb/config/libgfxinit_txtmode b/resources/coreboot/kfsn4-dre_1mb/config/libgfxinit_txtmode
index e0cc29e2..fe10b487 100644
--- a/resources/coreboot/kfsn4-dre_1mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/kfsn4-dre_1mb/config/libgfxinit_txtmode
@@ -143,14 +143,6 @@ CONFIG_CK804_PCI_E_X=1
CONFIG_CK804_PCIE_PME_WAKE=y
CONFIG_OVERRIDE_DEVICETREE=""
CONFIG_FMDFILE=""
-# CONFIG_BOARD_EMULATION_QEMU_AARCH64 is not set
-# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
-# CONFIG_BOARD_EMULATION_QEMU_POWER8 is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
-# CONFIG_BOARD_EMULATION_QEMU_RISCV_RV64 is not set
-# CONFIG_BOARD_EMULATION_QEMU_RISCV_RV32 is not set
-# CONFIG_BOARD_EMULATION_SPIKE_RISCV is not set
# CONFIG_VBOOT is not set
CONFIG_MMCONF_BASE_ADDRESS=0xc0000000
CONFIG_POST_DEVICE=y
@@ -529,8 +521,6 @@ CONFIG_DRIVERS_XGI_Z9S=y
# Trusted Platform Module
#
CONFIG_USER_NO_TPM=y
-# CONFIG_USER_TPM1 is not set
-# CONFIG_USER_TPM2 is not set
#
# Memory initialization
@@ -627,13 +617,8 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_YABITS is not set
# CONFIG_PAYLOAD_LINUX is not set
# CONFIG_PAYLOAD_TIANOCORE is not set
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
-# CONFIG_SEABIOS_REVISION is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_COMPRESSED_PAYLOAD_LZMA is not set
-# CONFIG_COMPRESSED_PAYLOAD_LZ4 is not set
# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
diff --git a/resources/coreboot/kfsn4-dre_2mb/board.cfg b/resources/coreboot/kfsn4-dre_2mb/board.cfg
index b7079280..c8686606 100644
--- a/resources/coreboot/kfsn4-dre_2mb/board.cfg
+++ b/resources/coreboot/kfsn4-dre_2mb/board.cfg
@@ -3,7 +3,5 @@ romtype="normal"
arch="x86_64"
payload_grub="n"
payload_grub_withseabios="n"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/kgpe-d16-rdimm_16mb/board.cfg b/resources/coreboot/kgpe-d16-rdimm_16mb/board.cfg
index e2787464..ced4feb4 100644
--- a/resources/coreboot/kgpe-d16-rdimm_16mb/board.cfg
+++ b/resources/coreboot/kgpe-d16-rdimm_16mb/board.cfg
@@ -3,7 +3,5 @@ romtype="d8d16sas"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/kgpe-d16-rdimm_2mb/board.cfg b/resources/coreboot/kgpe-d16-rdimm_2mb/board.cfg
index e2787464..ced4feb4 100644
--- a/resources/coreboot/kgpe-d16-rdimm_2mb/board.cfg
+++ b/resources/coreboot/kgpe-d16-rdimm_2mb/board.cfg
@@ -3,7 +3,5 @@ romtype="d8d16sas"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/kgpe-d16-rdimm_2mb/config/libgfxinit_txtmode b/resources/coreboot/kgpe-d16-rdimm_2mb/config/libgfxinit_txtmode
index 22b81380..f9533743 100644
--- a/resources/coreboot/kgpe-d16-rdimm_2mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/kgpe-d16-rdimm_2mb/config/libgfxinit_txtmode
@@ -144,14 +144,6 @@ CONFIG_MAX_REBOOT_CNT=10
CONFIG_OVERRIDE_DEVICETREE=""
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_FMDFILE=""
-# CONFIG_BOARD_EMULATION_QEMU_AARCH64 is not set
-# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
-# CONFIG_BOARD_EMULATION_QEMU_POWER8 is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
-# CONFIG_BOARD_EMULATION_QEMU_RISCV_RV64 is not set
-# CONFIG_BOARD_EMULATION_QEMU_RISCV_RV32 is not set
-# CONFIG_BOARD_EMULATION_SPIKE_RISCV is not set
# CONFIG_VBOOT is not set
CONFIG_MMCONF_BASE_ADDRESS=0xc0000000
CONFIG_POST_DEVICE=y
@@ -650,13 +642,8 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_YABITS is not set
# CONFIG_PAYLOAD_LINUX is not set
# CONFIG_PAYLOAD_TIANOCORE is not set
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
-# CONFIG_SEABIOS_REVISION is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_COMPRESSED_PAYLOAD_LZMA is not set
-# CONFIG_COMPRESSED_PAYLOAD_LZ4 is not set
# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
diff --git a/resources/coreboot/kgpe-d16-udimm_16mb/board.cfg b/resources/coreboot/kgpe-d16-udimm_16mb/board.cfg
index c87828c7..90caa033 100644
--- a/resources/coreboot/kgpe-d16-udimm_16mb/board.cfg
+++ b/resources/coreboot/kgpe-d16-udimm_16mb/board.cfg
@@ -3,7 +3,5 @@ romtype="d8d16sas"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/kgpe-d16-udimm_2mb/board.cfg b/resources/coreboot/kgpe-d16-udimm_2mb/board.cfg
index c87828c7..90caa033 100644
--- a/resources/coreboot/kgpe-d16-udimm_2mb/board.cfg
+++ b/resources/coreboot/kgpe-d16-udimm_2mb/board.cfg
@@ -3,7 +3,5 @@ romtype="d8d16sas"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/kgpe-d16-udimm_2mb/config/libgfxinit_txtmode b/resources/coreboot/kgpe-d16-udimm_2mb/config/libgfxinit_txtmode
index 22b81380..f9533743 100644
--- a/resources/coreboot/kgpe-d16-udimm_2mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/kgpe-d16-udimm_2mb/config/libgfxinit_txtmode
@@ -144,14 +144,6 @@ CONFIG_MAX_REBOOT_CNT=10
CONFIG_OVERRIDE_DEVICETREE=""
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_FMDFILE=""
-# CONFIG_BOARD_EMULATION_QEMU_AARCH64 is not set
-# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
-# CONFIG_BOARD_EMULATION_QEMU_POWER8 is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
-# CONFIG_BOARD_EMULATION_QEMU_RISCV_RV64 is not set
-# CONFIG_BOARD_EMULATION_QEMU_RISCV_RV32 is not set
-# CONFIG_BOARD_EMULATION_SPIKE_RISCV is not set
# CONFIG_VBOOT is not set
CONFIG_MMCONF_BASE_ADDRESS=0xc0000000
CONFIG_POST_DEVICE=y
@@ -650,13 +642,8 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_YABITS is not set
# CONFIG_PAYLOAD_LINUX is not set
# CONFIG_PAYLOAD_TIANOCORE is not set
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
-# CONFIG_SEABIOS_REVISION is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_COMPRESSED_PAYLOAD_LZMA is not set
-# CONFIG_COMPRESSED_PAYLOAD_LZ4 is not set
# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
diff --git a/resources/coreboot/macbook11/board.cfg b/resources/coreboot/macbook11/board.cfg
index 234d6a95..68d0f0fa 100644
--- a/resources/coreboot/macbook11/board.cfg
+++ b/resources/coreboot/macbook11/board.cfg
@@ -1,9 +1,7 @@
-cbtree="macbook21"
+cbtree="default"
romtype="i945 laptop"
arch="x86_32"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/macbook11/config/libgfxinit_corebootfb b/resources/coreboot/macbook11/config/libgfxinit_corebootfb
index 1cbb9231..59c31b65 100644
--- a/resources/coreboot/macbook11/config/libgfxinit_corebootfb
+++ b/resources/coreboot/macbook11/config/libgfxinit_corebootfb
@@ -131,8 +131,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
@@ -186,11 +186,11 @@ CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
CONFIG_VBT_DATA_SIZE_KB=8
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
@@ -200,12 +200,12 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=3
# CONFIG_PCIEXP_ASPM is not set
# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
CONFIG_INTEL_HAS_TOP_SWAP=y
# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set
CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000
@@ -333,12 +333,12 @@ CONFIG_LINEAR_FRAMEBUFFER=y
# end of Display
CONFIG_PCI=y
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
diff --git a/resources/coreboot/macbook11/config/libgfxinit_txtmode b/resources/coreboot/macbook11/config/libgfxinit_txtmode
index 58f34beb..ed467789 100644
--- a/resources/coreboot/macbook11/config/libgfxinit_txtmode
+++ b/resources/coreboot/macbook11/config/libgfxinit_txtmode
@@ -131,8 +131,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
@@ -186,11 +186,11 @@ CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
CONFIG_VBT_DATA_SIZE_KB=8
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
@@ -200,12 +200,12 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=3
# CONFIG_PCIEXP_ASPM is not set
# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
CONFIG_INTEL_HAS_TOP_SWAP=y
# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set
CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000
@@ -331,12 +331,12 @@ CONFIG_VGA_TEXT_FRAMEBUFFER=y
# end of Display
CONFIG_PCI=y
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
diff --git a/resources/coreboot/macbook21/blobs.list b/resources/coreboot/macbook21/blobs.list
deleted file mode 100644
index 05d3ee48..00000000
--- a/resources/coreboot/macbook21/blobs.list
+++ /dev/null
@@ -1,22 +0,0 @@
-src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000119.c
-3rdparty/arm-trusted-firmware/plat/mediatek/mt8173/drivers/spm/spm_hotplug.c
-3rdparty/arm-trusted-firmware/plat/mediatek/mt8173/drivers/spm/spm_mcdi.c
-3rdparty/arm-trusted-firmware/plat/mediatek/mt8173/drivers/spm/spm_suspend.c
-3rdparty/arm-trusted-firmware/plat/rockchip/rk3368/drivers/ddr/rk3368_ddr_reg_resume_V1.05.bin
-3rdparty/chromeec/test/legacy_nvmem_dump.h
-3rdparty/vboot/tests/futility/data/bios_link_mp.bin
-3rdparty/vboot/tests/futility/data/bios_peppy_mp.bin
-src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500000B.c
-src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch0500001A.c
-src/vendorcode/amd/agesa/f14/Proc/CPU/Family/0x14/F14MicrocodePatch05000029.c
-src/vendorcode/amd/agesa/f14/Proc/GNB/Nb/Family/0x14/F14NbSmuFirmware.h
-src/vendorcode/amd/agesa/f14/Proc/GNB/PCIe/Family/0x14/F14PcieAlibSsdt.h
-src/vendorcode/amd/agesa/f15tn/Proc/CPU/Family/0x15/TN/F15TnMicrocodePatch0600111F_Enc.c
-src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/GnbSmuFirmwareTN.h
-src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieAlibSsdtTNFM2.h
-src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbInitTN/PcieAlibSsdtTNFS1.h
-src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbId7001MicrocodePatch.c
-src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/AlibSsdtKB.h
-src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbSamuPatchKB.h
-src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/GnbSmuFirmwareKB.h
-3rdparty/chromeec/third_party/bmi260/accelgyro_bmi260_config_tbin.h
diff --git a/resources/coreboot/macbook21/board.cfg b/resources/coreboot/macbook21/board.cfg
index 51ffb4d1..ec68265a 100644
--- a/resources/coreboot/macbook21/board.cfg
+++ b/resources/coreboot/macbook21/board.cfg
@@ -1,10 +1,7 @@
-cbtree="macbook21"
+cbtree="default"
romtype="i945 laptop"
-cbrevision="acbbbede42dd00f93d8b39603dc7c052b389c43f"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/macbook21/config/libgfxinit_corebootfb b/resources/coreboot/macbook21/config/libgfxinit_corebootfb
index a7e8d67a..87c2d576 100644
--- a/resources/coreboot/macbook21/config/libgfxinit_corebootfb
+++ b/resources/coreboot/macbook21/config/libgfxinit_corebootfb
@@ -131,8 +131,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
@@ -186,11 +186,11 @@ CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
CONFIG_VBT_DATA_SIZE_KB=8
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
@@ -200,12 +200,12 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=3
# CONFIG_PCIEXP_ASPM is not set
# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
CONFIG_INTEL_HAS_TOP_SWAP=y
# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set
CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000
@@ -333,12 +333,12 @@ CONFIG_LINEAR_FRAMEBUFFER=y
# end of Display
CONFIG_PCI=y
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
diff --git a/resources/coreboot/macbook21/config/libgfxinit_txtmode b/resources/coreboot/macbook21/config/libgfxinit_txtmode
index e166b65b..564dd234 100644
--- a/resources/coreboot/macbook21/config/libgfxinit_txtmode
+++ b/resources/coreboot/macbook21/config/libgfxinit_txtmode
@@ -131,8 +131,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
@@ -186,11 +186,11 @@ CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
CONFIG_VBT_DATA_SIZE_KB=8
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
@@ -200,12 +200,12 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=3
# CONFIG_PCIEXP_ASPM is not set
# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
CONFIG_INTEL_HAS_TOP_SWAP=y
# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set
CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000
@@ -331,12 +331,12 @@ CONFIG_VGA_TEXT_FRAMEBUFFER=y
# end of Display
CONFIG_PCI=y
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
diff --git a/resources/coreboot/r400_16mb/board.cfg b/resources/coreboot/r400_16mb/board.cfg
index eceac155..0bfcc33a 100644
--- a/resources/coreboot/r400_16mb/board.cfg
+++ b/resources/coreboot/r400_16mb/board.cfg
@@ -3,7 +3,5 @@ romtype="16MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/r400_16mb/config/libgfxinit_corebootfb b/resources/coreboot/r400_16mb/config/libgfxinit_corebootfb
index 6766061c..a0b80920 100644
--- a/resources/coreboot/r400_16mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/r400_16mb/config/libgfxinit_corebootfb
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,8 +119,10 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -134,8 +135,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
@@ -143,7 +144,6 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad R400"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -169,6 +169,7 @@ CONFIG_BOARD_LENOVO_R400=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -185,8 +186,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -213,11 +213,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -226,64 +224,39 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_P=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -291,33 +264,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -326,35 +291,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -367,10 +323,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -378,35 +330,17 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
CONFIG_H8_BEEP_ON_DEATH=y
CONFIG_H8_FLASH_LEDS_ON_DEATH=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -414,45 +348,29 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
@@ -461,15 +379,15 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
CONFIG_LINEAR_FRAMEBUFFER=y
# CONFIG_BOOTSPLASH is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -479,32 +397,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -515,96 +419,35 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP is not set
CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-# CONFIG_DRIVER_MAXIM_MAX77686 is not set
-# CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_DRIVER_PARADE_PS8640 is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -613,32 +456,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -681,33 +527,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -725,7 +564,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -735,6 +573,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -743,6 +583,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -759,31 +600,21 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_NO_CBFS_MCACHE=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/r400_16mb/config/libgfxinit_txtmode b/resources/coreboot/r400_16mb/config/libgfxinit_txtmode
index cea00a4c..e17020e1 100644
--- a/resources/coreboot/r400_16mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/r400_16mb/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,8 +119,10 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -132,8 +133,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
@@ -141,7 +142,6 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad R400"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -167,6 +167,7 @@ CONFIG_BOARD_LENOVO_R400=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -183,8 +184,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -211,11 +211,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -224,64 +222,39 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_P=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -289,33 +262,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -324,35 +289,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -365,10 +321,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -376,35 +328,17 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
CONFIG_H8_BEEP_ON_DEATH=y
CONFIG_H8_FLASH_LEDS_ON_DEATH=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -412,60 +346,44 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -475,32 +393,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -511,96 +415,35 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP is not set
CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-# CONFIG_DRIVER_MAXIM_MAX77686 is not set
-# CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_DRIVER_PARADE_PS8640 is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -609,32 +452,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -677,33 +523,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -721,7 +560,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -731,6 +569,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -739,6 +579,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -755,31 +596,21 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_NO_CBFS_MCACHE=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/r400_4mb/board.cfg b/resources/coreboot/r400_4mb/board.cfg
index 3f77ef8e..59178503 100644
--- a/resources/coreboot/r400_4mb/board.cfg
+++ b/resources/coreboot/r400_4mb/board.cfg
@@ -3,7 +3,5 @@ romtype="4MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/r400_4mb/config/libgfxinit_corebootfb b/resources/coreboot/r400_4mb/config/libgfxinit_corebootfb
index 6162006c..22d6dc02 100644
--- a/resources/coreboot/r400_4mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/r400_4mb/config/libgfxinit_corebootfb
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,8 +119,10 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -134,8 +135,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
@@ -143,7 +144,6 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad R400"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -169,6 +169,7 @@ CONFIG_BOARD_LENOVO_R400=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -185,8 +186,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -213,11 +213,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -226,64 +224,39 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_P=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -291,33 +264,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -326,35 +291,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -367,10 +323,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -378,35 +330,17 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
CONFIG_H8_BEEP_ON_DEATH=y
CONFIG_H8_FLASH_LEDS_ON_DEATH=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -414,45 +348,29 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
@@ -461,15 +379,15 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
CONFIG_LINEAR_FRAMEBUFFER=y
# CONFIG_BOOTSPLASH is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -479,32 +397,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -515,96 +419,35 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP is not set
CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-# CONFIG_DRIVER_MAXIM_MAX77686 is not set
-# CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_DRIVER_PARADE_PS8640 is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -613,32 +456,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -681,33 +527,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -725,7 +564,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -735,6 +573,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -743,6 +583,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -759,31 +600,21 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_NO_CBFS_MCACHE=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/r400_4mb/config/libgfxinit_txtmode b/resources/coreboot/r400_4mb/config/libgfxinit_txtmode
index 8d35cbb7..74a041e0 100644
--- a/resources/coreboot/r400_4mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/r400_4mb/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,8 +119,10 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -132,8 +133,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
@@ -141,7 +142,6 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad R400"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -167,6 +167,7 @@ CONFIG_BOARD_LENOVO_R400=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -183,8 +184,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -211,11 +211,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -224,64 +222,39 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_P=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -289,33 +262,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -324,35 +289,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -365,10 +321,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -376,35 +328,17 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
CONFIG_H8_BEEP_ON_DEATH=y
CONFIG_H8_FLASH_LEDS_ON_DEATH=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -412,60 +346,44 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -475,32 +393,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -511,96 +415,35 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP is not set
CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-# CONFIG_DRIVER_MAXIM_MAX77686 is not set
-# CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_DRIVER_PARADE_PS8640 is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -609,32 +452,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -677,33 +523,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -721,7 +560,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -731,6 +569,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -739,6 +579,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -755,31 +596,21 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_NO_CBFS_MCACHE=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/r400_8mb/board.cfg b/resources/coreboot/r400_8mb/board.cfg
index 38738f3d..f69577e1 100644
--- a/resources/coreboot/r400_8mb/board.cfg
+++ b/resources/coreboot/r400_8mb/board.cfg
@@ -3,7 +3,5 @@ romtype="8MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/r400_8mb/config/libgfxinit_corebootfb b/resources/coreboot/r400_8mb/config/libgfxinit_corebootfb
index f6bcd973..cb969b95 100644
--- a/resources/coreboot/r400_8mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/r400_8mb/config/libgfxinit_corebootfb
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,8 +119,10 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -134,8 +135,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
@@ -143,7 +144,6 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad R400"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -169,6 +169,7 @@ CONFIG_BOARD_LENOVO_R400=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -185,8 +186,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -213,11 +213,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -226,64 +224,39 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_P=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -291,33 +264,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -326,35 +291,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -367,10 +323,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -378,35 +330,17 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
CONFIG_H8_BEEP_ON_DEATH=y
CONFIG_H8_FLASH_LEDS_ON_DEATH=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -414,45 +348,29 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
@@ -461,15 +379,15 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
CONFIG_LINEAR_FRAMEBUFFER=y
# CONFIG_BOOTSPLASH is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -479,32 +397,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -515,96 +419,35 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP is not set
CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-# CONFIG_DRIVER_MAXIM_MAX77686 is not set
-# CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_DRIVER_PARADE_PS8640 is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -613,32 +456,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -681,33 +527,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -725,7 +564,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -735,6 +573,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -743,6 +583,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -759,31 +600,21 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_NO_CBFS_MCACHE=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/r400_8mb/config/libgfxinit_txtmode b/resources/coreboot/r400_8mb/config/libgfxinit_txtmode
index 65909bf1..042d4ce4 100644
--- a/resources/coreboot/r400_8mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/r400_8mb/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,8 +119,10 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -132,8 +133,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
@@ -141,7 +142,6 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad R400"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -167,6 +167,7 @@ CONFIG_BOARD_LENOVO_R400=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -183,8 +184,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -211,11 +211,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -224,64 +222,39 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_P=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -289,33 +262,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -324,35 +289,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -365,10 +321,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -376,35 +328,17 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
CONFIG_H8_BEEP_ON_DEATH=y
CONFIG_H8_FLASH_LEDS_ON_DEATH=y
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -412,60 +346,44 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -475,32 +393,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -511,96 +415,35 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP is not set
CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-# CONFIG_DRIVER_MAXIM_MAX77686 is not set
-# CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_DRIVER_PARADE_PS8640 is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -609,32 +452,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -677,33 +523,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -721,7 +560,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -731,6 +569,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -739,6 +579,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -755,31 +596,21 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_NO_CBFS_MCACHE=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/r500_4mb/board.cfg b/resources/coreboot/r500_4mb/board.cfg
index bbd0baf4..b631011f 100644
--- a/resources/coreboot/r500_4mb/board.cfg
+++ b/resources/coreboot/r500_4mb/board.cfg
@@ -3,7 +3,5 @@ romtype="4MiB ICH9 IFD NOGBE NOR flash"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/r500_4mb/config/libgfxinit_corebootfb b/resources/coreboot/r500_4mb/config/libgfxinit_corebootfb
index eb46bdfe..af435376 100644
--- a/resources/coreboot/r500_4mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/r500_4mb/config/libgfxinit_corebootfb
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,8 +119,10 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -134,8 +135,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
@@ -143,7 +144,6 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad R500"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -169,6 +169,7 @@ CONFIG_BOARD_LENOVO_R500=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -185,8 +186,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -213,11 +213,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -226,64 +224,39 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_P=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -291,33 +264,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -326,35 +291,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -367,10 +323,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -378,35 +330,16 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
-# 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
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -414,45 +347,29 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
@@ -461,15 +378,15 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
CONFIG_LINEAR_FRAMEBUFFER=y
# CONFIG_BOOTSPLASH is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -479,32 +396,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -515,96 +418,35 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP is not set
CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-# CONFIG_DRIVER_MAXIM_MAX77686 is not set
-# CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_DRIVER_PARADE_PS8640 is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -613,32 +455,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -681,33 +526,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -725,7 +563,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -735,6 +572,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -743,6 +582,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -759,31 +599,21 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_NO_CBFS_MCACHE=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/r500_4mb/config/libgfxinit_txtmode b/resources/coreboot/r500_4mb/config/libgfxinit_txtmode
index 8b59b635..300194a6 100644
--- a/resources/coreboot/r500_4mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/r500_4mb/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,8 +119,10 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -132,8 +133,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
@@ -141,7 +142,6 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad R500"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -167,6 +167,7 @@ CONFIG_BOARD_LENOVO_R500=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -183,8 +184,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -211,11 +211,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -224,64 +222,39 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_P=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -289,33 +262,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -324,35 +289,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -365,10 +321,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -376,35 +328,16 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
-# 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
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -412,60 +345,44 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -475,32 +392,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -511,96 +414,35 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP is not set
CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-# CONFIG_DRIVER_MAXIM_MAX77686 is not set
-# CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_DRIVER_PARADE_PS8640 is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -609,32 +451,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -677,33 +522,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -721,7 +559,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -731,6 +568,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -739,6 +578,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -755,31 +595,21 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_NO_CBFS_MCACHE=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/t400_16mb/board.cfg b/resources/coreboot/t400_16mb/board.cfg
index eceac155..0bfcc33a 100644
--- a/resources/coreboot/t400_16mb/board.cfg
+++ b/resources/coreboot/t400_16mb/board.cfg
@@ -3,7 +3,5 @@ romtype="16MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/t400_16mb/config/libgfxinit_corebootfb b/resources/coreboot/t400_16mb/config/libgfxinit_corebootfb
index 0adb9af7..7c8e53d7 100644
--- a/resources/coreboot/t400_16mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/t400_16mb/config/libgfxinit_corebootfb
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,8 +119,10 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -134,8 +135,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
@@ -143,7 +144,6 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T400"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -169,6 +169,7 @@ CONFIG_BOARD_LENOVO_T400=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -185,8 +186,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -213,11 +213,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -226,64 +224,39 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_P=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -291,33 +264,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -326,35 +291,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -367,10 +323,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -378,35 +330,17 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -414,45 +348,29 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
@@ -461,15 +379,15 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
CONFIG_LINEAR_FRAMEBUFFER=y
# CONFIG_BOOTSPLASH is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -479,32 +397,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -515,96 +419,35 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP is not set
CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-# CONFIG_DRIVER_MAXIM_MAX77686 is not set
-# CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_DRIVER_PARADE_PS8640 is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -613,32 +456,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -681,33 +527,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -725,7 +564,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -735,6 +573,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -743,6 +583,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -759,31 +600,21 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_NO_CBFS_MCACHE=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/t400_16mb/config/libgfxinit_txtmode b/resources/coreboot/t400_16mb/config/libgfxinit_txtmode
index 81d8a391..80070028 100644
--- a/resources/coreboot/t400_16mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/t400_16mb/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,8 +119,10 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -132,8 +133,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
@@ -141,7 +142,6 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T400"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -167,6 +167,7 @@ CONFIG_BOARD_LENOVO_T400=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -183,8 +184,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -211,11 +211,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -224,64 +222,39 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_P=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -289,33 +262,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -324,35 +289,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -365,10 +321,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -376,35 +328,17 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -412,60 +346,44 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -475,32 +393,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -511,96 +415,35 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP is not set
CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-# CONFIG_DRIVER_MAXIM_MAX77686 is not set
-# CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_DRIVER_PARADE_PS8640 is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -609,32 +452,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -677,33 +523,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -721,7 +560,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -731,6 +569,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -739,6 +579,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -755,31 +596,21 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_NO_CBFS_MCACHE=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/t400_4mb/board.cfg b/resources/coreboot/t400_4mb/board.cfg
index 3f77ef8e..59178503 100644
--- a/resources/coreboot/t400_4mb/board.cfg
+++ b/resources/coreboot/t400_4mb/board.cfg
@@ -3,7 +3,5 @@ romtype="4MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/t400_4mb/config/libgfxinit_corebootfb b/resources/coreboot/t400_4mb/config/libgfxinit_corebootfb
index 64062dd8..dd562fad 100644
--- a/resources/coreboot/t400_4mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/t400_4mb/config/libgfxinit_corebootfb
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,8 +119,10 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -134,8 +135,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
@@ -143,7 +144,6 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T400"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -169,6 +169,7 @@ CONFIG_BOARD_LENOVO_T400=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -185,8 +186,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -213,11 +213,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -226,64 +224,39 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_P=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -291,33 +264,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -326,35 +291,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -367,10 +323,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -378,35 +330,17 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -414,45 +348,29 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
@@ -461,15 +379,15 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
CONFIG_LINEAR_FRAMEBUFFER=y
# CONFIG_BOOTSPLASH is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -479,32 +397,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -515,96 +419,35 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP is not set
CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-# CONFIG_DRIVER_MAXIM_MAX77686 is not set
-# CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_DRIVER_PARADE_PS8640 is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -613,32 +456,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -681,33 +527,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -725,7 +564,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -735,6 +573,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -743,6 +583,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -759,31 +600,21 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_NO_CBFS_MCACHE=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/t400_4mb/config/libgfxinit_txtmode b/resources/coreboot/t400_4mb/config/libgfxinit_txtmode
index 309c1c4b..43bf6059 100644
--- a/resources/coreboot/t400_4mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/t400_4mb/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,8 +119,10 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -132,8 +133,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
@@ -141,7 +142,6 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T400"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -167,6 +167,7 @@ CONFIG_BOARD_LENOVO_T400=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -183,8 +184,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -211,11 +211,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -224,64 +222,39 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_P=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -289,33 +262,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -324,35 +289,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -365,10 +321,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -376,35 +328,17 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -412,60 +346,44 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -475,32 +393,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -511,96 +415,35 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP is not set
CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-# CONFIG_DRIVER_MAXIM_MAX77686 is not set
-# CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_DRIVER_PARADE_PS8640 is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -609,32 +452,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -677,33 +523,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -721,7 +560,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -731,6 +569,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -739,6 +579,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -755,31 +596,21 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_NO_CBFS_MCACHE=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/t400_8mb/board.cfg b/resources/coreboot/t400_8mb/board.cfg
index 38738f3d..f69577e1 100644
--- a/resources/coreboot/t400_8mb/board.cfg
+++ b/resources/coreboot/t400_8mb/board.cfg
@@ -3,7 +3,5 @@ romtype="8MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/t400_8mb/config/libgfxinit_corebootfb b/resources/coreboot/t400_8mb/config/libgfxinit_corebootfb
index 235260fb..82a12aa7 100644
--- a/resources/coreboot/t400_8mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/t400_8mb/config/libgfxinit_corebootfb
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,8 +119,10 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -134,8 +135,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
@@ -143,7 +144,6 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T400"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -169,6 +169,7 @@ CONFIG_BOARD_LENOVO_T400=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -185,8 +186,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -213,11 +213,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -226,64 +224,39 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_P=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -291,33 +264,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -326,35 +291,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -367,10 +323,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -378,35 +330,17 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -414,45 +348,29 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
@@ -461,15 +379,15 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
CONFIG_LINEAR_FRAMEBUFFER=y
# CONFIG_BOOTSPLASH is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -479,32 +397,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -515,96 +419,35 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP is not set
CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-# CONFIG_DRIVER_MAXIM_MAX77686 is not set
-# CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_DRIVER_PARADE_PS8640 is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -613,32 +456,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -681,33 +527,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -725,7 +564,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -735,6 +573,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -743,6 +583,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -759,31 +600,21 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_NO_CBFS_MCACHE=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/t400_8mb/config/libgfxinit_txtmode b/resources/coreboot/t400_8mb/config/libgfxinit_txtmode
index 25058263..5e477901 100644
--- a/resources/coreboot/t400_8mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/t400_8mb/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,8 +119,10 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -132,8 +133,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
@@ -141,7 +142,6 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T400"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -167,6 +167,7 @@ CONFIG_BOARD_LENOVO_T400=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -183,8 +184,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -211,11 +211,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -224,64 +222,39 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_P=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -289,33 +262,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -324,35 +289,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -365,10 +321,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -376,35 +328,17 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -412,60 +346,44 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -475,32 +393,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -511,96 +415,35 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP is not set
CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-# CONFIG_DRIVER_MAXIM_MAX77686 is not set
-# CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_DRIVER_PARADE_PS8640 is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -609,32 +452,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -677,33 +523,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -721,7 +560,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -731,6 +569,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -739,6 +579,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -755,31 +596,21 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_NO_CBFS_MCACHE=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/t500_16mb/board.cfg b/resources/coreboot/t500_16mb/board.cfg
index eceac155..0bfcc33a 100644
--- a/resources/coreboot/t500_16mb/board.cfg
+++ b/resources/coreboot/t500_16mb/board.cfg
@@ -3,7 +3,5 @@ romtype="16MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/t500_16mb/config/libgfxinit_corebootfb b/resources/coreboot/t500_16mb/config/libgfxinit_corebootfb
index a1a572be..f0f3fe1f 100644
--- a/resources/coreboot/t500_16mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/t500_16mb/config/libgfxinit_corebootfb
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,8 +119,10 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -134,8 +135,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
@@ -143,7 +144,6 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T500"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -169,6 +169,7 @@ CONFIG_BOARD_LENOVO_T500=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -185,8 +186,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -213,11 +213,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -226,64 +224,39 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_P=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -291,33 +264,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -326,35 +291,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -367,10 +323,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -378,35 +330,17 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -414,45 +348,29 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
@@ -461,15 +379,15 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
CONFIG_LINEAR_FRAMEBUFFER=y
# CONFIG_BOOTSPLASH is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -479,32 +397,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -515,96 +419,35 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP is not set
CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-# CONFIG_DRIVER_MAXIM_MAX77686 is not set
-# CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_DRIVER_PARADE_PS8640 is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -613,32 +456,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -681,33 +527,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -725,7 +564,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -735,6 +573,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -743,6 +583,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -759,31 +600,21 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_NO_CBFS_MCACHE=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/t500_16mb/config/libgfxinit_txtmode b/resources/coreboot/t500_16mb/config/libgfxinit_txtmode
index a8c2fddf..c64bd905 100644
--- a/resources/coreboot/t500_16mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/t500_16mb/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,8 +119,10 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -132,8 +133,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
@@ -141,7 +142,6 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T500"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -167,6 +167,7 @@ CONFIG_BOARD_LENOVO_T500=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -183,8 +184,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -211,11 +211,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -224,64 +222,39 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_P=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -289,33 +262,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -324,35 +289,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -365,10 +321,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -376,35 +328,17 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -412,60 +346,44 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -475,32 +393,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -511,96 +415,35 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP is not set
CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-# CONFIG_DRIVER_MAXIM_MAX77686 is not set
-# CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_DRIVER_PARADE_PS8640 is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -609,32 +452,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -677,33 +523,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -721,7 +560,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -731,6 +569,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -739,6 +579,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -755,31 +596,21 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_NO_CBFS_MCACHE=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/t500_4mb/board.cfg b/resources/coreboot/t500_4mb/board.cfg
index 3f77ef8e..59178503 100644
--- a/resources/coreboot/t500_4mb/board.cfg
+++ b/resources/coreboot/t500_4mb/board.cfg
@@ -3,7 +3,5 @@ romtype="4MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/t500_4mb/config/libgfxinit_corebootfb b/resources/coreboot/t500_4mb/config/libgfxinit_corebootfb
index be529c1c..f16c173c 100644
--- a/resources/coreboot/t500_4mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/t500_4mb/config/libgfxinit_corebootfb
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,8 +119,10 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -134,8 +135,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
@@ -143,7 +144,6 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T500"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -169,6 +169,7 @@ CONFIG_BOARD_LENOVO_T500=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -185,8 +186,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -213,11 +213,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -226,64 +224,39 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_P=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -291,33 +264,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -326,35 +291,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -367,10 +323,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -378,35 +330,17 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -414,45 +348,29 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
@@ -461,15 +379,15 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
CONFIG_LINEAR_FRAMEBUFFER=y
# CONFIG_BOOTSPLASH is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -479,32 +397,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -515,96 +419,35 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP is not set
CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-# CONFIG_DRIVER_MAXIM_MAX77686 is not set
-# CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_DRIVER_PARADE_PS8640 is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -613,32 +456,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -681,33 +527,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -725,7 +564,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -735,6 +573,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -743,6 +583,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -759,31 +600,21 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_NO_CBFS_MCACHE=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/t500_4mb/config/libgfxinit_txtmode b/resources/coreboot/t500_4mb/config/libgfxinit_txtmode
index 6ae5210c..ff48af07 100644
--- a/resources/coreboot/t500_4mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/t500_4mb/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,8 +119,10 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -132,8 +133,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
@@ -141,7 +142,6 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T500"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -167,6 +167,7 @@ CONFIG_BOARD_LENOVO_T500=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -183,8 +184,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -211,11 +211,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -224,64 +222,39 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_P=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -289,33 +262,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -324,35 +289,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -365,10 +321,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -376,35 +328,17 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -412,60 +346,44 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -475,32 +393,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -511,96 +415,35 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP is not set
CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-# CONFIG_DRIVER_MAXIM_MAX77686 is not set
-# CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_DRIVER_PARADE_PS8640 is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -609,32 +452,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -677,33 +523,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -721,7 +560,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -731,6 +569,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -739,6 +579,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -755,31 +596,21 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_NO_CBFS_MCACHE=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/t500_8mb/board.cfg b/resources/coreboot/t500_8mb/board.cfg
index 38738f3d..f69577e1 100644
--- a/resources/coreboot/t500_8mb/board.cfg
+++ b/resources/coreboot/t500_8mb/board.cfg
@@ -3,7 +3,5 @@ romtype="8MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/t500_8mb/config/libgfxinit_corebootfb b/resources/coreboot/t500_8mb/config/libgfxinit_corebootfb
index 057ac8d5..bbdedf63 100644
--- a/resources/coreboot/t500_8mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/t500_8mb/config/libgfxinit_corebootfb
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,8 +119,10 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -134,8 +135,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
@@ -143,7 +144,6 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T500"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -169,6 +169,7 @@ CONFIG_BOARD_LENOVO_T500=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -185,8 +186,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -213,11 +213,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -226,64 +224,39 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_P=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -291,33 +264,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -326,35 +291,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -367,10 +323,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -378,35 +330,17 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -414,45 +348,29 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
@@ -461,15 +379,15 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
CONFIG_LINEAR_FRAMEBUFFER=y
# CONFIG_BOOTSPLASH is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -479,32 +397,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -515,96 +419,35 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP is not set
CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-# CONFIG_DRIVER_MAXIM_MAX77686 is not set
-# CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_DRIVER_PARADE_PS8640 is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -613,32 +456,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -681,33 +527,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -725,7 +564,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -735,6 +573,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -743,6 +583,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -759,31 +600,21 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_NO_CBFS_MCACHE=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/t500_8mb/config/libgfxinit_txtmode b/resources/coreboot/t500_8mb/config/libgfxinit_txtmode
index 3a70c150..0637abaf 100644
--- a/resources/coreboot/t500_8mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/t500_8mb/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,8 +119,10 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -132,8 +133,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
@@ -141,7 +142,6 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T500"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -167,6 +167,7 @@ CONFIG_BOARD_LENOVO_T500=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -183,8 +184,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -211,11 +211,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -224,64 +222,39 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_P=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -289,33 +262,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -324,35 +289,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -365,10 +321,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -376,35 +328,17 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -412,60 +346,44 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -475,32 +393,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -511,96 +415,35 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP is not set
CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-# CONFIG_DRIVER_MAXIM_MAX77686 is not set
-# CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_DRIVER_PARADE_PS8640 is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -609,32 +452,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -677,33 +523,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -721,7 +560,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -731,6 +569,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -739,6 +579,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -755,31 +596,21 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_NO_CBFS_MCACHE=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/t60_16mb_intelgpu/board.cfg b/resources/coreboot/t60_16mb_intelgpu/board.cfg
index 9ddafdd5..68d0f0fa 100644
--- a/resources/coreboot/t60_16mb_intelgpu/board.cfg
+++ b/resources/coreboot/t60_16mb_intelgpu/board.cfg
@@ -3,7 +3,5 @@ romtype="i945 laptop"
arch="x86_32"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/t60_16mb_intelgpu/config/libgfxinit_corebootfb b/resources/coreboot/t60_16mb_intelgpu/config/libgfxinit_corebootfb
index ec6442cc..25b3b8bd 100644
--- a/resources/coreboot/t60_16mb_intelgpu/config/libgfxinit_corebootfb
+++ b/resources/coreboot/t60_16mb_intelgpu/config/libgfxinit_corebootfb
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,6 +119,8 @@ CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -129,16 +130,14 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
-CONFIG_CBFS_MCACHE_SIZE=0x2000
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T60"
# CONFIG_BOARD_LENOVO_G505S is not set
# CONFIG_BOARD_LENOVO_L520 is not set
@@ -163,6 +162,7 @@ CONFIG_BOARD_LENOVO_T60=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -179,8 +179,6 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="IBM0057"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -208,11 +206,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -221,68 +217,44 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
+CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=3
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
CONFIG_INTEL_HAS_TOP_SWAP=y
# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set
CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6EX=y
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_SOCKET_SPECIFIC_OPTIONS=y
CONFIG_CPU_INTEL_SOCKET_M=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -290,33 +262,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -325,22 +289,16 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_I945=y
-# CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC is not set
CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
CONFIG_I945_LVDS=y
-# CONFIG_OVERRIDE_CLOCK_DISABLE is not set
-# CONFIG_CHECK_SLFRCS_ON_RESUME is not set
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
CONFIG_SOUTHBRIDGE_TI_PCI1X2X=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
@@ -348,20 +306,16 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7=y
-# 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=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE is not set
CONFIG_INTEL_CHIPSET_LOCKDOWN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_WATCHDOG=y
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -371,10 +325,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -382,25 +332,11 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
-# CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL is not set
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -408,31 +344,19 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
@@ -440,13 +364,9 @@ CONFIG_HAVE_CF9_RESET=y
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
-# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
@@ -455,15 +375,15 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
CONFIG_LINEAR_FRAMEBUFFER=y
# CONFIG_BOOTSPLASH is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -473,32 +393,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -509,86 +415,26 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
-# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
CONFIG_DRIVERS_I2C_CK505=y
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# 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_IPMI_OCP 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_INTEL_GMA_OPREGION_2_0=y
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -597,32 +443,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -665,33 +514,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -709,7 +551,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -719,6 +560,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -727,6 +570,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -743,25 +587,15 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
-# CONFIG_SPD_CACHE_IN_FMAP is not set
+# end of Debugging
+
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/t60_16mb_intelgpu/config/libgfxinit_txtmode b/resources/coreboot/t60_16mb_intelgpu/config/libgfxinit_txtmode
index c9206f9a..9d747f38 100644
--- a/resources/coreboot/t60_16mb_intelgpu/config/libgfxinit_txtmode
+++ b/resources/coreboot/t60_16mb_intelgpu/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,6 +119,8 @@ CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -129,16 +130,14 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
-CONFIG_CBFS_MCACHE_SIZE=0x2000
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T60"
# CONFIG_BOARD_LENOVO_G505S is not set
# CONFIG_BOARD_LENOVO_L520 is not set
@@ -163,6 +162,7 @@ CONFIG_BOARD_LENOVO_T60=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -179,8 +179,6 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="IBM0057"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -208,11 +206,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -221,68 +217,44 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
+CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=3
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
CONFIG_INTEL_HAS_TOP_SWAP=y
# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set
CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6EX=y
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_SOCKET_SPECIFIC_OPTIONS=y
CONFIG_CPU_INTEL_SOCKET_M=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -290,33 +262,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -325,22 +289,16 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_I945=y
-# CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC is not set
CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
CONFIG_I945_LVDS=y
-# CONFIG_OVERRIDE_CLOCK_DISABLE is not set
-# CONFIG_CHECK_SLFRCS_ON_RESUME is not set
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
CONFIG_SOUTHBRIDGE_TI_PCI1X2X=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
@@ -348,20 +306,16 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7=y
-# 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=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE is not set
CONFIG_INTEL_CHIPSET_LOCKDOWN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_WATCHDOG=y
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -371,10 +325,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -382,25 +332,11 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
-# CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL is not set
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -408,31 +344,19 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
@@ -440,28 +364,24 @@ CONFIG_HAVE_CF9_RESET=y
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
-# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -471,32 +391,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -507,86 +413,26 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
-# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
CONFIG_DRIVERS_I2C_CK505=y
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# 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_IPMI_OCP 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_INTEL_GMA_OPREGION_2_0=y
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -595,32 +441,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -663,33 +512,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -707,7 +549,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -717,6 +558,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -725,6 +568,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -741,25 +585,15 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
-# CONFIG_SPD_CACHE_IN_FMAP is not set
+# end of Debugging
+
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/t60_intelgpu/board.cfg b/resources/coreboot/t60_intelgpu/board.cfg
index 9ddafdd5..68d0f0fa 100644
--- a/resources/coreboot/t60_intelgpu/board.cfg
+++ b/resources/coreboot/t60_intelgpu/board.cfg
@@ -3,7 +3,5 @@ romtype="i945 laptop"
arch="x86_32"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/t60_intelgpu/config/libgfxinit_corebootfb b/resources/coreboot/t60_intelgpu/config/libgfxinit_corebootfb
index 31682721..9ed3814e 100644
--- a/resources/coreboot/t60_intelgpu/config/libgfxinit_corebootfb
+++ b/resources/coreboot/t60_intelgpu/config/libgfxinit_corebootfb
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,6 +119,8 @@ CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -129,16 +130,14 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
-CONFIG_CBFS_MCACHE_SIZE=0x2000
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T60"
# CONFIG_BOARD_LENOVO_G505S is not set
# CONFIG_BOARD_LENOVO_L520 is not set
@@ -163,6 +162,7 @@ CONFIG_BOARD_LENOVO_T60=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -179,8 +179,6 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="IBM0057"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -208,11 +206,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -221,68 +217,44 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
+CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=3
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
CONFIG_INTEL_HAS_TOP_SWAP=y
# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set
CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6EX=y
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_SOCKET_SPECIFIC_OPTIONS=y
CONFIG_CPU_INTEL_SOCKET_M=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -290,33 +262,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -325,22 +289,16 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_I945=y
-# CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC is not set
CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
CONFIG_I945_LVDS=y
-# CONFIG_OVERRIDE_CLOCK_DISABLE is not set
-# CONFIG_CHECK_SLFRCS_ON_RESUME is not set
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
CONFIG_SOUTHBRIDGE_TI_PCI1X2X=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
@@ -348,20 +306,16 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7=y
-# 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=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE is not set
CONFIG_INTEL_CHIPSET_LOCKDOWN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_WATCHDOG=y
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -371,10 +325,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -382,25 +332,11 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
-# CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL is not set
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -408,31 +344,19 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
@@ -440,13 +364,9 @@ CONFIG_HAVE_CF9_RESET=y
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
-# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
@@ -455,15 +375,15 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
CONFIG_LINEAR_FRAMEBUFFER=y
# CONFIG_BOOTSPLASH is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -473,32 +393,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -509,86 +415,26 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
-# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
CONFIG_DRIVERS_I2C_CK505=y
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# 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_IPMI_OCP 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_INTEL_GMA_OPREGION_2_0=y
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -597,32 +443,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -665,33 +514,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -709,7 +551,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -719,6 +560,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -727,6 +570,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -743,25 +587,15 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
-# CONFIG_SPD_CACHE_IN_FMAP is not set
+# end of Debugging
+
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/t60_intelgpu/config/libgfxinit_txtmode b/resources/coreboot/t60_intelgpu/config/libgfxinit_txtmode
index cf61620b..f3647350 100644
--- a/resources/coreboot/t60_intelgpu/config/libgfxinit_txtmode
+++ b/resources/coreboot/t60_intelgpu/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,6 +119,8 @@ CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -129,16 +130,14 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
-CONFIG_CBFS_MCACHE_SIZE=0x2000
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T60"
# CONFIG_BOARD_LENOVO_G505S is not set
# CONFIG_BOARD_LENOVO_L520 is not set
@@ -163,6 +162,7 @@ CONFIG_BOARD_LENOVO_T60=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -179,8 +179,6 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="IBM0057"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -208,11 +206,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -221,68 +217,44 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
+CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=3
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
CONFIG_INTEL_HAS_TOP_SWAP=y
# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set
CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6EX=y
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_SOCKET_SPECIFIC_OPTIONS=y
CONFIG_CPU_INTEL_SOCKET_M=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -290,33 +262,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -325,22 +289,16 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_I945=y
-# CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC is not set
CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
CONFIG_I945_LVDS=y
-# CONFIG_OVERRIDE_CLOCK_DISABLE is not set
-# CONFIG_CHECK_SLFRCS_ON_RESUME is not set
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
CONFIG_SOUTHBRIDGE_TI_PCI1X2X=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
@@ -348,20 +306,16 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7=y
-# 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=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE is not set
CONFIG_INTEL_CHIPSET_LOCKDOWN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_WATCHDOG=y
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -371,10 +325,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -382,25 +332,11 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
-# CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL is not set
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -408,31 +344,19 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
@@ -440,28 +364,24 @@ CONFIG_HAVE_CF9_RESET=y
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
-# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -471,32 +391,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -507,86 +413,26 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
-# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
CONFIG_DRIVERS_I2C_CK505=y
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# 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_IPMI_OCP 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_INTEL_GMA_OPREGION_2_0=y
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -595,32 +441,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -663,33 +512,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -707,7 +549,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -717,6 +558,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -725,6 +568,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -741,25 +585,15 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
-# CONFIG_SPD_CACHE_IN_FMAP is not set
+# end of Debugging
+
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/w500_16mb/board.cfg b/resources/coreboot/w500_16mb/board.cfg
index eceac155..0bfcc33a 100644
--- a/resources/coreboot/w500_16mb/board.cfg
+++ b/resources/coreboot/w500_16mb/board.cfg
@@ -3,7 +3,5 @@ romtype="16MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/w500_16mb/config/libgfxinit_corebootfb b/resources/coreboot/w500_16mb/config/libgfxinit_corebootfb
index c788090a..996ada61 100644
--- a/resources/coreboot/w500_16mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/w500_16mb/config/libgfxinit_corebootfb
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,8 +119,10 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -134,8 +135,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
@@ -143,7 +144,6 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad W500"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -169,6 +169,7 @@ CONFIG_BOARD_LENOVO_W500=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -185,8 +186,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -213,11 +213,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -226,64 +224,39 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_P=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -291,33 +264,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -326,35 +291,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -367,10 +323,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -378,35 +330,17 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -414,45 +348,29 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
@@ -461,15 +379,15 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
CONFIG_LINEAR_FRAMEBUFFER=y
# CONFIG_BOOTSPLASH is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -479,32 +397,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -515,96 +419,35 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP is not set
CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-# CONFIG_DRIVER_MAXIM_MAX77686 is not set
-# CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_DRIVER_PARADE_PS8640 is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -613,32 +456,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -681,33 +527,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -725,7 +564,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -735,6 +573,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -743,6 +583,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -759,31 +600,21 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_NO_CBFS_MCACHE=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/w500_16mb/config/libgfxinit_txtmode b/resources/coreboot/w500_16mb/config/libgfxinit_txtmode
index 363cf9e5..3b448b9f 100644
--- a/resources/coreboot/w500_16mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/w500_16mb/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,8 +119,10 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -132,8 +133,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
@@ -141,7 +142,6 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad W500"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -167,6 +167,7 @@ CONFIG_BOARD_LENOVO_W500=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -183,8 +184,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -211,11 +211,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -224,64 +222,39 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_P=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -289,33 +262,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -324,35 +289,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -365,10 +321,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -376,35 +328,17 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -412,60 +346,44 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -475,32 +393,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -511,96 +415,35 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP is not set
CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-# CONFIG_DRIVER_MAXIM_MAX77686 is not set
-# CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_DRIVER_PARADE_PS8640 is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -609,32 +452,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -677,33 +523,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -721,7 +560,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -731,6 +569,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -739,6 +579,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -755,31 +596,21 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_NO_CBFS_MCACHE=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/w500_4mb/board.cfg b/resources/coreboot/w500_4mb/board.cfg
index 3f77ef8e..59178503 100644
--- a/resources/coreboot/w500_4mb/board.cfg
+++ b/resources/coreboot/w500_4mb/board.cfg
@@ -3,7 +3,5 @@ romtype="4MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/w500_4mb/config/libgfxinit_corebootfb b/resources/coreboot/w500_4mb/config/libgfxinit_corebootfb
index 0fbe98e4..f9ca6753 100644
--- a/resources/coreboot/w500_4mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/w500_4mb/config/libgfxinit_corebootfb
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,8 +119,10 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -134,8 +135,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
@@ -143,7 +144,6 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad W500"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -169,6 +169,7 @@ CONFIG_BOARD_LENOVO_W500=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -185,8 +186,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -213,11 +213,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -226,64 +224,39 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_P=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -291,33 +264,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -326,35 +291,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -367,10 +323,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -378,35 +330,17 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -414,45 +348,29 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
@@ -461,15 +379,15 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
CONFIG_LINEAR_FRAMEBUFFER=y
# CONFIG_BOOTSPLASH is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -479,32 +397,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -515,96 +419,35 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP is not set
CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-# CONFIG_DRIVER_MAXIM_MAX77686 is not set
-# CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_DRIVER_PARADE_PS8640 is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -613,32 +456,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -681,33 +527,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -725,7 +564,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -735,6 +573,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -743,6 +583,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -759,31 +600,21 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_NO_CBFS_MCACHE=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/w500_4mb/config/libgfxinit_txtmode b/resources/coreboot/w500_4mb/config/libgfxinit_txtmode
index 0708dfdd..e4e7ae7f 100644
--- a/resources/coreboot/w500_4mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/w500_4mb/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,8 +119,10 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -132,8 +133,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
@@ -141,7 +142,6 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad W500"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -167,6 +167,7 @@ CONFIG_BOARD_LENOVO_W500=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -183,8 +184,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -211,11 +211,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -224,64 +222,39 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_P=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -289,33 +262,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -324,35 +289,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -365,10 +321,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -376,35 +328,17 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -412,60 +346,44 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -475,32 +393,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -511,96 +415,35 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP is not set
CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-# CONFIG_DRIVER_MAXIM_MAX77686 is not set
-# CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_DRIVER_PARADE_PS8640 is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -609,32 +452,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -677,33 +523,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -721,7 +560,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -731,6 +569,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -739,6 +579,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -755,31 +596,21 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_NO_CBFS_MCACHE=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/w500_8mb/board.cfg b/resources/coreboot/w500_8mb/board.cfg
index 38738f3d..f69577e1 100644
--- a/resources/coreboot/w500_8mb/board.cfg
+++ b/resources/coreboot/w500_8mb/board.cfg
@@ -3,7 +3,5 @@ romtype="8MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/w500_8mb/config/libgfxinit_corebootfb b/resources/coreboot/w500_8mb/config/libgfxinit_corebootfb
index 0befa2d0..3f0252d0 100644
--- a/resources/coreboot/w500_8mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/w500_8mb/config/libgfxinit_corebootfb
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,8 +119,10 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -134,8 +135,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
@@ -143,7 +144,6 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad W500"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -169,6 +169,7 @@ CONFIG_BOARD_LENOVO_W500=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -185,8 +186,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -213,11 +213,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -226,64 +224,39 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_P=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -291,33 +264,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -326,35 +291,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -367,10 +323,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -378,35 +330,17 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -414,45 +348,29 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
@@ -461,15 +379,15 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
CONFIG_LINEAR_FRAMEBUFFER=y
# CONFIG_BOOTSPLASH is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -479,32 +397,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -515,96 +419,35 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP is not set
CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-# CONFIG_DRIVER_MAXIM_MAX77686 is not set
-# CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_DRIVER_PARADE_PS8640 is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -613,32 +456,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -681,33 +527,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -725,7 +564,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -735,6 +573,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -743,6 +583,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -759,31 +600,21 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_NO_CBFS_MCACHE=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/w500_8mb/config/libgfxinit_txtmode b/resources/coreboot/w500_8mb/config/libgfxinit_txtmode
index b83363d3..7f898636 100644
--- a/resources/coreboot/w500_8mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/w500_8mb/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -120,8 +119,10 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -132,8 +133,8 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
@@ -141,7 +142,6 @@ CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad W500"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -167,6 +167,7 @@ CONFIG_BOARD_LENOVO_W500=y
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -183,8 +184,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -211,11 +211,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -224,64 +222,39 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_P=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -289,33 +262,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -324,35 +289,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -365,10 +321,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87384=y
@@ -376,35 +328,17 @@ CONFIG_SUPERIO_NSC_PC87384=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -412,60 +346,44 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -475,32 +393,18 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -511,96 +415,35 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP is not set
CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS=y
-# CONFIG_DRIVER_MAXIM_MAX77686 is not set
-# CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_DRIVER_PARADE_PS8640 is not set
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -609,32 +452,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -677,33 +523,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -721,7 +560,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -731,6 +569,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -739,6 +579,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -755,31 +596,21 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_NO_CBFS_MCACHE=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/x200_16mb/board.cfg b/resources/coreboot/x200_16mb/board.cfg
index eceac155..0bfcc33a 100644
--- a/resources/coreboot/x200_16mb/board.cfg
+++ b/resources/coreboot/x200_16mb/board.cfg
@@ -3,7 +3,5 @@ romtype="16MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/x200_16mb/config/libgfxinit_corebootfb b/resources/coreboot/x200_16mb/config/libgfxinit_corebootfb
index ae66a8e1..0de9f837 100644
--- a/resources/coreboot/x200_16mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/x200_16mb/config/libgfxinit_corebootfb
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -119,8 +118,10 @@ CONFIG_DEVICETREE="devicetree.cb"
CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_CONSOLE_POST is not set
CONFIG_POST_DEVICE=y
@@ -132,16 +133,14 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-# CONFIG_PCIEXP_HOTPLUG is not set
-CONFIG_CBFS_MCACHE_SIZE=0x2000
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -167,6 +166,7 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
CONFIG_BOARD_LENOVO_X200=y
@@ -183,8 +183,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
# CONFIG_DRIVERS_UART_8250IO is not set
@@ -211,11 +210,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -224,61 +221,37 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
+CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_BGA956=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -286,33 +259,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -321,35 +286,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -362,45 +318,23 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -408,45 +342,28 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_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_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
@@ -455,15 +372,15 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
CONFIG_LINEAR_FRAMEBUFFER=y
# CONFIG_BOOTSPLASH is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -472,35 +389,22 @@ CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
# CONFIG_INTEL_GMA_ADD_VBT is not set
# CONFIG_SOFTWARE_I2C is not set
-# CONFIG_RESOURCE_ALLOCATOR_V3 is not set
CONFIG_RESOURCE_ALLOCATOR_V4=y
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
CONFIG_DRIVERS_LENOVO_WACOM=y
CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -511,94 +415,34 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP 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_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -607,32 +451,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -659,33 +506,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -703,7 +543,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -713,6 +552,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -721,6 +562,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -736,30 +578,20 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/x200_16mb/config/libgfxinit_txtmode b/resources/coreboot/x200_16mb/config/libgfxinit_txtmode
index b8ee4422..dbeef704 100644
--- a/resources/coreboot/x200_16mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/x200_16mb/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -119,8 +118,10 @@ CONFIG_DEVICETREE="devicetree.cb"
CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_CONSOLE_POST is not set
CONFIG_POST_DEVICE=y
@@ -130,16 +131,14 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-# CONFIG_PCIEXP_HOTPLUG is not set
-CONFIG_CBFS_MCACHE_SIZE=0x2000
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -165,6 +164,7 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
CONFIG_BOARD_LENOVO_X200=y
@@ -181,8 +181,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
# CONFIG_DRIVERS_UART_8250IO is not set
@@ -209,11 +208,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -222,61 +219,37 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
+CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_BGA956=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -284,33 +257,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -319,35 +284,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -360,45 +316,23 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -406,60 +340,43 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_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_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -468,35 +385,22 @@ CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
# CONFIG_INTEL_GMA_ADD_VBT is not set
# CONFIG_SOFTWARE_I2C is not set
-# CONFIG_RESOURCE_ALLOCATOR_V3 is not set
CONFIG_RESOURCE_ALLOCATOR_V4=y
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
CONFIG_DRIVERS_LENOVO_WACOM=y
CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -507,94 +411,34 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP 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_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -603,32 +447,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -655,33 +502,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -699,7 +539,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -709,6 +548,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -717,6 +558,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -732,30 +574,20 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/x200_4mb/board.cfg b/resources/coreboot/x200_4mb/board.cfg
index 3f77ef8e..59178503 100644
--- a/resources/coreboot/x200_4mb/board.cfg
+++ b/resources/coreboot/x200_4mb/board.cfg
@@ -3,7 +3,5 @@ romtype="4MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/x200_4mb/config/libgfxinit_corebootfb b/resources/coreboot/x200_4mb/config/libgfxinit_corebootfb
index 5e7b9d01..c492ff0c 100644
--- a/resources/coreboot/x200_4mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/x200_4mb/config/libgfxinit_corebootfb
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -119,8 +118,10 @@ CONFIG_DEVICETREE="devicetree.cb"
CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_CONSOLE_POST is not set
CONFIG_POST_DEVICE=y
@@ -132,16 +133,14 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-# CONFIG_PCIEXP_HOTPLUG is not set
-CONFIG_CBFS_MCACHE_SIZE=0x2000
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -167,6 +166,7 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
CONFIG_BOARD_LENOVO_X200=y
@@ -183,8 +183,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
# CONFIG_DRIVERS_UART_8250IO is not set
@@ -211,11 +210,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -224,61 +221,37 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
+CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_BGA956=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -286,33 +259,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -321,35 +286,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -362,45 +318,23 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -408,45 +342,28 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_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_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
@@ -455,15 +372,15 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
CONFIG_LINEAR_FRAMEBUFFER=y
# CONFIG_BOOTSPLASH is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -472,35 +389,22 @@ CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
# CONFIG_INTEL_GMA_ADD_VBT is not set
# CONFIG_SOFTWARE_I2C is not set
-# CONFIG_RESOURCE_ALLOCATOR_V3 is not set
CONFIG_RESOURCE_ALLOCATOR_V4=y
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
CONFIG_DRIVERS_LENOVO_WACOM=y
CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -511,94 +415,34 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP 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_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -607,32 +451,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -659,33 +506,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -703,7 +543,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -713,6 +552,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -721,6 +562,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -736,30 +578,20 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/x200_4mb/config/libgfxinit_txtmode b/resources/coreboot/x200_4mb/config/libgfxinit_txtmode
index d964c1f2..33cebd45 100644
--- a/resources/coreboot/x200_4mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/x200_4mb/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -119,8 +118,10 @@ CONFIG_DEVICETREE="devicetree.cb"
CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_CONSOLE_POST is not set
CONFIG_POST_DEVICE=y
@@ -130,16 +131,14 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-# CONFIG_PCIEXP_HOTPLUG is not set
-CONFIG_CBFS_MCACHE_SIZE=0x2000
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -165,6 +164,7 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
CONFIG_BOARD_LENOVO_X200=y
@@ -181,8 +181,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
# CONFIG_DRIVERS_UART_8250IO is not set
@@ -209,11 +208,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -222,61 +219,37 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
+CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_BGA956=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -284,33 +257,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -319,35 +284,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -360,45 +316,23 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -406,60 +340,43 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_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_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -468,35 +385,22 @@ CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
# CONFIG_INTEL_GMA_ADD_VBT is not set
# CONFIG_SOFTWARE_I2C is not set
-# CONFIG_RESOURCE_ALLOCATOR_V3 is not set
CONFIG_RESOURCE_ALLOCATOR_V4=y
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
CONFIG_DRIVERS_LENOVO_WACOM=y
CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -507,94 +411,34 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP 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_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -603,32 +447,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -655,33 +502,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -699,7 +539,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -709,6 +548,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -717,6 +558,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -732,30 +574,20 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/x200_8mb/board.cfg b/resources/coreboot/x200_8mb/board.cfg
index 38738f3d..f69577e1 100644
--- a/resources/coreboot/x200_8mb/board.cfg
+++ b/resources/coreboot/x200_8mb/board.cfg
@@ -3,7 +3,5 @@ romtype="8MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/x200_8mb/config/libgfxinit_corebootfb b/resources/coreboot/x200_8mb/config/libgfxinit_corebootfb
index 2b2c5b25..49f6c5cd 100644
--- a/resources/coreboot/x200_8mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/x200_8mb/config/libgfxinit_corebootfb
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -119,8 +118,10 @@ CONFIG_DEVICETREE="devicetree.cb"
CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_CONSOLE_POST is not set
CONFIG_POST_DEVICE=y
@@ -132,16 +133,14 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-# CONFIG_PCIEXP_HOTPLUG is not set
-CONFIG_CBFS_MCACHE_SIZE=0x2000
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -167,6 +166,7 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
CONFIG_BOARD_LENOVO_X200=y
@@ -183,8 +183,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
# CONFIG_DRIVERS_UART_8250IO is not set
@@ -211,11 +210,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -224,61 +221,37 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
+CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_BGA956=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -286,33 +259,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -321,35 +286,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -362,45 +318,23 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -408,45 +342,28 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_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_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
@@ -455,15 +372,15 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
CONFIG_LINEAR_FRAMEBUFFER=y
# CONFIG_BOOTSPLASH is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -472,35 +389,22 @@ CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
# CONFIG_INTEL_GMA_ADD_VBT is not set
# CONFIG_SOFTWARE_I2C is not set
-# CONFIG_RESOURCE_ALLOCATOR_V3 is not set
CONFIG_RESOURCE_ALLOCATOR_V4=y
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
CONFIG_DRIVERS_LENOVO_WACOM=y
CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -511,94 +415,34 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP 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_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -607,32 +451,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -659,33 +506,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -703,7 +543,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -713,6 +552,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -721,6 +562,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -736,30 +578,20 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/x200_8mb/config/libgfxinit_txtmode b/resources/coreboot/x200_8mb/config/libgfxinit_txtmode
index 3623aeb1..008a5370 100644
--- a/resources/coreboot/x200_8mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/x200_8mb/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -119,8 +118,10 @@ CONFIG_DEVICETREE="devicetree.cb"
CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_CONSOLE_POST is not set
CONFIG_POST_DEVICE=y
@@ -130,16 +131,14 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-# CONFIG_PCIEXP_HOTPLUG is not set
-CONFIG_CBFS_MCACHE_SIZE=0x2000
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
@@ -165,6 +164,7 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
CONFIG_BOARD_LENOVO_X200=y
@@ -181,8 +181,7 @@ CONFIG_PS2K_EISAID="LEN0010"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
# CONFIG_DRIVERS_UART_8250IO is not set
@@ -209,11 +208,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -222,61 +219,37 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
+CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_BGA956=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -284,33 +257,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -319,35 +284,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -360,45 +316,23 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -406,60 +340,43 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_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_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -468,35 +385,22 @@ CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
# CONFIG_INTEL_GMA_ADD_VBT is not set
# CONFIG_SOFTWARE_I2C is not set
-# CONFIG_RESOURCE_ALLOCATOR_V3 is not set
CONFIG_RESOURCE_ALLOCATOR_V4=y
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
CONFIG_DRIVERS_LENOVO_WACOM=y
CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -507,94 +411,34 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP 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_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -603,32 +447,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -655,33 +502,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -699,7 +539,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -709,6 +548,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -717,6 +558,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -732,30 +574,20 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/x301_16mb/board.cfg b/resources/coreboot/x301_16mb/board.cfg
index eceac155..0bfcc33a 100644
--- a/resources/coreboot/x301_16mb/board.cfg
+++ b/resources/coreboot/x301_16mb/board.cfg
@@ -3,7 +3,5 @@ romtype="16MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/x301_16mb/config/libgfxinit_corebootfb b/resources/coreboot/x301_16mb/config/libgfxinit_corebootfb
index 44ed2a58..8f7e90f6 100644
--- a/resources/coreboot/x301_16mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/x301_16mb/config/libgfxinit_corebootfb
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -119,8 +118,10 @@ CONFIG_DEVICETREE="devicetree.cb"
CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_CONSOLE_POST is not set
CONFIG_POST_DEVICE=y
@@ -132,21 +133,19 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_PCIEXP_HOTPLUG=y
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
+# CONFIG_HAVE_IFD_BIN is not set
CONFIG_PCIEXP_HOTPLUG_BUSES=8
CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
-CONFIG_CBFS_MCACHE_SIZE=0x2000
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
-# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
# CONFIG_BOARD_LENOVO_L520 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
@@ -170,6 +169,7 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -186,8 +186,7 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
# CONFIG_DRIVERS_UART_8250IO is not set
@@ -214,11 +213,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -227,61 +224,37 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
+CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_BGA956=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -289,33 +262,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -324,35 +289,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -365,45 +321,23 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -411,45 +345,28 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_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_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
@@ -458,15 +375,15 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
CONFIG_LINEAR_FRAMEBUFFER=y
# CONFIG_BOOTSPLASH is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -478,35 +395,22 @@ CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
# CONFIG_INTEL_GMA_ADD_VBT is not set
# CONFIG_SOFTWARE_I2C is not set
-# CONFIG_RESOURCE_ALLOCATOR_V3 is not set
CONFIG_RESOURCE_ALLOCATOR_V4=y
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
CONFIG_DRIVERS_LENOVO_WACOM=y
CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -517,94 +421,34 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP 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_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -613,32 +457,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -665,33 +512,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -709,7 +549,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -719,6 +558,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -727,6 +568,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -742,30 +584,20 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/x301_16mb/config/libgfxinit_txtmode b/resources/coreboot/x301_16mb/config/libgfxinit_txtmode
index 91bc8084..929e8855 100644
--- a/resources/coreboot/x301_16mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/x301_16mb/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -119,8 +118,10 @@ CONFIG_DEVICETREE="devicetree.cb"
CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_CONSOLE_POST is not set
CONFIG_POST_DEVICE=y
@@ -130,21 +131,19 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_PCIEXP_HOTPLUG=y
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
+# CONFIG_HAVE_IFD_BIN is not set
CONFIG_PCIEXP_HOTPLUG_BUSES=8
CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
-CONFIG_CBFS_MCACHE_SIZE=0x2000
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
-# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
# CONFIG_BOARD_LENOVO_L520 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
@@ -168,6 +167,7 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -184,8 +184,7 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
# CONFIG_DRIVERS_UART_8250IO is not set
@@ -212,11 +211,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -225,61 +222,37 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
+CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_BGA956=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -287,33 +260,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -322,35 +287,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -363,45 +319,23 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -409,60 +343,43 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_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_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -474,35 +391,22 @@ CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
# CONFIG_INTEL_GMA_ADD_VBT is not set
# CONFIG_SOFTWARE_I2C is not set
-# CONFIG_RESOURCE_ALLOCATOR_V3 is not set
CONFIG_RESOURCE_ALLOCATOR_V4=y
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
CONFIG_DRIVERS_LENOVO_WACOM=y
CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -513,94 +417,34 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP 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_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -609,32 +453,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -661,33 +508,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -705,7 +545,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -715,6 +554,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -723,6 +564,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -738,30 +580,20 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/x301_4mb/board.cfg b/resources/coreboot/x301_4mb/board.cfg
index 3f77ef8e..59178503 100644
--- a/resources/coreboot/x301_4mb/board.cfg
+++ b/resources/coreboot/x301_4mb/board.cfg
@@ -3,7 +3,5 @@ romtype="4MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/x301_4mb/config/libgfxinit_corebootfb b/resources/coreboot/x301_4mb/config/libgfxinit_corebootfb
index 066736c8..9a877383 100644
--- a/resources/coreboot/x301_4mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/x301_4mb/config/libgfxinit_corebootfb
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -119,8 +118,10 @@ CONFIG_DEVICETREE="devicetree.cb"
CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_CONSOLE_POST is not set
CONFIG_POST_DEVICE=y
@@ -132,21 +133,19 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_PCIEXP_HOTPLUG=y
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
+# CONFIG_HAVE_IFD_BIN is not set
CONFIG_PCIEXP_HOTPLUG_BUSES=8
CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
-CONFIG_CBFS_MCACHE_SIZE=0x2000
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
-# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
# CONFIG_BOARD_LENOVO_L520 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
@@ -170,6 +169,7 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -186,8 +186,7 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
# CONFIG_DRIVERS_UART_8250IO is not set
@@ -214,11 +213,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -227,61 +224,37 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
+CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_BGA956=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -289,33 +262,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -324,35 +289,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -365,45 +321,23 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -411,45 +345,28 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_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_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
@@ -458,15 +375,15 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
CONFIG_LINEAR_FRAMEBUFFER=y
# CONFIG_BOOTSPLASH is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -478,35 +395,22 @@ CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
# CONFIG_INTEL_GMA_ADD_VBT is not set
# CONFIG_SOFTWARE_I2C is not set
-# CONFIG_RESOURCE_ALLOCATOR_V3 is not set
CONFIG_RESOURCE_ALLOCATOR_V4=y
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
CONFIG_DRIVERS_LENOVO_WACOM=y
CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -517,94 +421,34 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP 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_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -613,32 +457,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -665,33 +512,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -709,7 +549,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -719,6 +558,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -727,6 +568,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -742,30 +584,20 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/x301_4mb/config/libgfxinit_txtmode b/resources/coreboot/x301_4mb/config/libgfxinit_txtmode
index c01b03d9..1bdc6ecd 100644
--- a/resources/coreboot/x301_4mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/x301_4mb/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -119,40 +118,32 @@ CONFIG_DEVICETREE="devicetree.cb"
CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_CONSOLE_POST is not set
CONFIG_POST_DEVICE=y
-# CONFIG_BOARD_EMULATION_QEMU_AARCH64 is not set
-# CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
-# CONFIG_BOARD_EMULATION_QEMU_POWER8 is not set
-# CONFIG_BOARD_EMULATION_QEMU_X86_Q35 is not set
-# CONFIG_BOARD_EMULATION_QEMU_RISCV_RV64 is not set
-# CONFIG_BOARD_EMULATION_QEMU_RISCV_RV32 is not set
-# CONFIG_BOARD_EMULATION_SPIKE_RISCV is not set
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
CONFIG_VBOOT_SLOTS_RW_A=y
CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_PCIEXP_HOTPLUG=y
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
+# CONFIG_HAVE_IFD_BIN is not set
CONFIG_PCIEXP_HOTPLUG_BUSES=8
CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
-CONFIG_CBFS_MCACHE_SIZE=0x2000
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
-# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
# CONFIG_BOARD_LENOVO_L520 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
@@ -176,6 +167,7 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -192,8 +184,7 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
# CONFIG_DRIVERS_UART_8250IO is not set
@@ -220,11 +211,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -233,61 +222,37 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
+CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_BGA956=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -295,35 +260,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_CPU_QEMU_X86_LAPIC_INIT is not set
-# CONFIG_CPU_QEMU_X86_PARALLEL_MP is not set
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -332,35 +287,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -373,45 +319,23 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -419,61 +343,43 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_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_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
-# CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT is not set
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -485,35 +391,22 @@ CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
# CONFIG_INTEL_GMA_ADD_VBT is not set
# CONFIG_SOFTWARE_I2C is not set
-# CONFIG_RESOURCE_ALLOCATOR_V3 is not set
CONFIG_RESOURCE_ALLOCATOR_V4=y
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
CONFIG_DRIVERS_LENOVO_WACOM=y
CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -524,94 +417,34 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP 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_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -620,32 +453,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -672,33 +508,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -714,15 +543,8 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_YABITS is not set
# CONFIG_PAYLOAD_LINUX is not set
# CONFIG_PAYLOAD_TIANOCORE is not set
-# CONFIG_SEABIOS_STABLE is not set
-# CONFIG_SEABIOS_MASTER is not set
-# CONFIG_SEABIOS_REVISION is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_COMPRESSED_PAYLOAD_NONE is not set
-# CONFIG_COMPRESSED_PAYLOAD_LZMA is not set
-# CONFIG_COMPRESSED_PAYLOAD_LZ4 is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -732,6 +554,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -740,6 +564,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -755,30 +580,20 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/x301_8mb/board.cfg b/resources/coreboot/x301_8mb/board.cfg
index 38738f3d..f69577e1 100644
--- a/resources/coreboot/x301_8mb/board.cfg
+++ b/resources/coreboot/x301_8mb/board.cfg
@@ -3,7 +3,5 @@ romtype="8MiB ICH9 IFD NOR flash"
arch="x86_64"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/x301_8mb/config/libgfxinit_corebootfb b/resources/coreboot/x301_8mb/config/libgfxinit_corebootfb
index 3402355f..ac074165 100644
--- a/resources/coreboot/x301_8mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/x301_8mb/config/libgfxinit_corebootfb
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -119,8 +118,10 @@ CONFIG_DEVICETREE="devicetree.cb"
CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_CONSOLE_POST is not set
CONFIG_POST_DEVICE=y
@@ -132,21 +133,19 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_PCIEXP_HOTPLUG=y
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
+# CONFIG_HAVE_IFD_BIN is not set
CONFIG_PCIEXP_HOTPLUG_BUSES=8
CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
-CONFIG_CBFS_MCACHE_SIZE=0x2000
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
-# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
# CONFIG_BOARD_LENOVO_L520 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
@@ -170,6 +169,7 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -186,8 +186,7 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
# CONFIG_DRIVERS_UART_8250IO is not set
@@ -214,11 +213,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -227,61 +224,37 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
+CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_BGA956=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -289,33 +262,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -324,35 +289,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -365,45 +321,23 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -411,45 +345,28 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_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_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
@@ -458,15 +375,15 @@ CONFIG_MAINBOARD_USE_LIBGFXINIT=y
CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
CONFIG_LINEAR_FRAMEBUFFER=y
# CONFIG_BOOTSPLASH is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -478,35 +395,22 @@ CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
# CONFIG_INTEL_GMA_ADD_VBT is not set
# CONFIG_SOFTWARE_I2C is not set
-# CONFIG_RESOURCE_ALLOCATOR_V3 is not set
CONFIG_RESOURCE_ALLOCATOR_V4=y
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
CONFIG_DRIVERS_LENOVO_WACOM=y
CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -517,94 +421,34 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP 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_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -613,32 +457,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -665,33 +512,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -709,7 +549,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -719,6 +558,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -727,6 +568,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -742,30 +584,20 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/x301_8mb/config/libgfxinit_txtmode b/resources/coreboot/x301_8mb/config/libgfxinit_txtmode
index cc725441..a0212221 100644
--- a/resources/coreboot/x301_8mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/x301_8mb/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -119,8 +118,10 @@ CONFIG_DEVICETREE="devicetree.cb"
CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_USBDEBUG_HCD_INDEX=2
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
# CONFIG_CONSOLE_POST is not set
CONFIG_POST_DEVICE=y
@@ -130,21 +131,19 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_HAVE_INTEL_FIRMWARE=y
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-CONFIG_PCIEXP_HOTPLUG=y
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
+# CONFIG_HAVE_IFD_BIN is not set
CONFIG_PCIEXP_HOTPLUG_BUSES=8
CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
-CONFIG_CBFS_MCACHE_SIZE=0x2000
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
-# CONFIG_HAVE_IFD_BIN is not set
# CONFIG_BOARD_LENOVO_G505S is not set
# CONFIG_BOARD_LENOVO_L520 is not set
# CONFIG_BOARD_LENOVO_S230U is not set
@@ -168,6 +167,7 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -184,8 +184,7 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="PNP0F13"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
+CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
# CONFIG_DRIVERS_UART_8250IO is not set
@@ -212,11 +211,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -225,61 +222,37 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
+CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0x61254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0x61256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=4
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_1067X=y
CONFIG_CPU_INTEL_SOCKET_BGA956=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -287,33 +260,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -322,35 +287,26 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_GM45=y
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+CONFIG_PCIEXP_HOTPLUG=y
CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-# CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
@@ -363,45 +319,23 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_PC87382=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
#
# Intel Firmware
#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -409,60 +343,43 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_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_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
#
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
CONFIG_MAINBOARD_USE_LIBGFXINIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -474,35 +391,22 @@ CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
# CONFIG_INTEL_GMA_ADD_VBT is not set
# CONFIG_SOFTWARE_I2C is not set
-# CONFIG_RESOURCE_ALLOCATOR_V3 is not set
CONFIG_RESOURCE_ALLOCATOR_V4=y
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
CONFIG_DRIVERS_LENOVO_WACOM=y
CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -513,94 +417,34 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
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_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=y
CONFIG_HAVE_USBDEBUG_OPTIONS=y
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
CONFIG_DRIVERS_GENERIC_IOAPIC=y
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# CONFIG_INTEL_GMA_SWSMISCI is not set
-# CONFIG_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
+CONFIG_INTEL_GMA_OPREGION_2_0=y
CONFIG_GFX_GMA_DYN_CPU=y
CONFIG_GFX_GMA_GENERATION="G45"
CONFIG_GFX_GMA_PCH="No_PCH"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP 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_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -609,32 +453,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -661,33 +508,26 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
#
CONFIG_GENERATE_MP_TABLE=y
-# CONFIG_GENERATE_PIRQ_TABLE is not set
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -705,7 +545,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -715,6 +554,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -723,6 +564,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -738,30 +580,20 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
+# end of Debugging
+
CONFIG_RAMSTAGE_ADA=y
CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
CONFIG_HWBASE_DYNAMIC_MMIO=y
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
CONFIG_HWBASE_DIRECT_PCIDEV=y
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/x60/board.cfg b/resources/coreboot/x60/board.cfg
index 9ddafdd5..68d0f0fa 100644
--- a/resources/coreboot/x60/board.cfg
+++ b/resources/coreboot/x60/board.cfg
@@ -3,7 +3,5 @@ romtype="i945 laptop"
arch="x86_32"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/x60/config/libgfxinit_corebootfb b/resources/coreboot/x60/config/libgfxinit_corebootfb
index 1e8712f5..357daf49 100644
--- a/resources/coreboot/x60/config/libgfxinit_corebootfb
+++ b/resources/coreboot/x60/config/libgfxinit_corebootfb
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -121,6 +120,8 @@ CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -131,16 +132,14 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
-CONFIG_CBFS_MCACHE_SIZE=0x2000
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X60"
# CONFIG_BOARD_LENOVO_G505S is not set
# CONFIG_BOARD_LENOVO_L520 is not set
@@ -165,6 +164,7 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X60"
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -181,8 +181,6 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -210,11 +208,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -223,68 +219,44 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
+CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=3
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
CONFIG_INTEL_HAS_TOP_SWAP=y
# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set
CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6EX=y
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_SOCKET_SPECIFIC_OPTIONS=y
CONFIG_CPU_INTEL_SOCKET_M=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -292,33 +264,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -327,22 +291,16 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_I945=y
-# CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC is not set
CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
CONFIG_I945_LVDS=y
-# CONFIG_OVERRIDE_CLOCK_DISABLE is not set
-# CONFIG_CHECK_SLFRCS_ON_RESUME is not set
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
CONFIG_SOUTHBRIDGE_RICOH_RL5C476=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
@@ -350,20 +308,16 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7=y
-# 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=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE is not set
CONFIG_INTEL_CHIPSET_LOCKDOWN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_WATCHDOG=y
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -373,10 +327,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_COMMON_PRE_RAM=y
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87392=y
@@ -385,25 +335,11 @@ CONFIG_SUPERIO_NSC_PC87392=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
-# CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL is not set
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -411,31 +347,19 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
@@ -443,13 +367,9 @@ CONFIG_HAVE_CF9_RESET=y
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
-# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
@@ -458,15 +378,15 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
CONFIG_LINEAR_FRAMEBUFFER=y
# CONFIG_BOOTSPLASH is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -476,35 +396,22 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
CONFIG_DRIVERS_LENOVO_WACOM=y
CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -515,86 +422,26 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
-# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
CONFIG_DRIVERS_I2C_CK505=y
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# 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_IPMI_OCP 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_INTEL_GMA_OPREGION_2_0=y
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -603,32 +450,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -671,25 +521,18 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
CONFIG_HAVE_PIRQ_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
@@ -699,6 +542,7 @@ CONFIG_GENERATE_PIRQ_TABLE=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -716,7 +560,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -726,6 +569,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -734,6 +579,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -751,25 +597,15 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
-# CONFIG_SPD_CACHE_IN_FMAP is not set
+# end of Debugging
+
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/x60/config/libgfxinit_txtmode b/resources/coreboot/x60/config/libgfxinit_txtmode
index ae365a6d..74bf6e73 100644
--- a/resources/coreboot/x60/config/libgfxinit_txtmode
+++ b/resources/coreboot/x60/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -121,6 +120,8 @@ CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -131,16 +132,14 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
-CONFIG_CBFS_MCACHE_SIZE=0x2000
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X60"
# CONFIG_BOARD_LENOVO_G505S is not set
# CONFIG_BOARD_LENOVO_L520 is not set
@@ -165,6 +164,7 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X60"
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -181,8 +181,6 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -210,11 +208,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -223,68 +219,44 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
+CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=3
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
CONFIG_INTEL_HAS_TOP_SWAP=y
# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set
CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6EX=y
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_SOCKET_SPECIFIC_OPTIONS=y
CONFIG_CPU_INTEL_SOCKET_M=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -292,33 +264,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -327,22 +291,16 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_I945=y
-# CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC is not set
CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
CONFIG_I945_LVDS=y
-# CONFIG_OVERRIDE_CLOCK_DISABLE is not set
-# CONFIG_CHECK_SLFRCS_ON_RESUME is not set
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
CONFIG_SOUTHBRIDGE_RICOH_RL5C476=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
@@ -350,20 +308,16 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7=y
-# 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=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE is not set
CONFIG_INTEL_CHIPSET_LOCKDOWN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_WATCHDOG=y
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -373,10 +327,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_COMMON_PRE_RAM=y
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87392=y
@@ -385,25 +335,11 @@ CONFIG_SUPERIO_NSC_PC87392=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
-# CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL is not set
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -411,31 +347,19 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
@@ -443,28 +367,24 @@ CONFIG_HAVE_CF9_RESET=y
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
-# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -474,35 +394,22 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
CONFIG_DRIVERS_LENOVO_WACOM=y
CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -513,86 +420,26 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
-# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
CONFIG_DRIVERS_I2C_CK505=y
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# 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_IPMI_OCP 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_INTEL_GMA_OPREGION_2_0=y
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -601,32 +448,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -669,25 +519,18 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
CONFIG_HAVE_PIRQ_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
@@ -697,6 +540,7 @@ CONFIG_GENERATE_PIRQ_TABLE=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -714,7 +558,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -724,6 +567,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -732,6 +577,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -749,25 +595,15 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
-# CONFIG_SPD_CACHE_IN_FMAP is not set
+# end of Debugging
+
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/x60_16mb/board.cfg b/resources/coreboot/x60_16mb/board.cfg
index 9ddafdd5..68d0f0fa 100644
--- a/resources/coreboot/x60_16mb/board.cfg
+++ b/resources/coreboot/x60_16mb/board.cfg
@@ -3,7 +3,5 @@ romtype="i945 laptop"
arch="x86_32"
payload_grub="y"
payload_grub_withseabios="y"
-payload_grub_withtianocore="n"
payload_seabios="y"
-payload_tianocore="n"
payload_memtest="y"
diff --git a/resources/coreboot/x60_16mb/config/libgfxinit_corebootfb b/resources/coreboot/x60_16mb/config/libgfxinit_corebootfb
index cc6e9526..2a9af29d 100644
--- a/resources/coreboot/x60_16mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/x60_16mb/config/libgfxinit_corebootfb
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -121,6 +120,8 @@ CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -131,16 +132,14 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
-CONFIG_CBFS_MCACHE_SIZE=0x2000
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X60"
# CONFIG_BOARD_LENOVO_G505S is not set
# CONFIG_BOARD_LENOVO_L520 is not set
@@ -165,6 +164,7 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X60"
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -181,8 +181,6 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -210,11 +208,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -223,68 +219,44 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
+CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=3
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
CONFIG_INTEL_HAS_TOP_SWAP=y
# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set
CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6EX=y
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_SOCKET_SPECIFIC_OPTIONS=y
CONFIG_CPU_INTEL_SOCKET_M=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -292,33 +264,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -327,22 +291,16 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_I945=y
-# CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC is not set
CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
CONFIG_I945_LVDS=y
-# CONFIG_OVERRIDE_CLOCK_DISABLE is not set
-# CONFIG_CHECK_SLFRCS_ON_RESUME is not set
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
CONFIG_SOUTHBRIDGE_RICOH_RL5C476=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
@@ -350,20 +308,16 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7=y
-# 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=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE is not set
CONFIG_INTEL_CHIPSET_LOCKDOWN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_WATCHDOG=y
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -373,10 +327,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_COMMON_PRE_RAM=y
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87392=y
@@ -385,25 +335,11 @@ CONFIG_SUPERIO_NSC_PC87392=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
-# CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL is not set
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -411,31 +347,19 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
@@ -443,13 +367,9 @@ CONFIG_HAVE_CF9_RESET=y
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
-# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
@@ -458,15 +378,15 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
CONFIG_LINEAR_FRAMEBUFFER=y
# CONFIG_BOOTSPLASH is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -476,35 +396,22 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
CONFIG_DRIVERS_LENOVO_WACOM=y
CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -515,86 +422,26 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
-# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
CONFIG_DRIVERS_I2C_CK505=y
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# 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_IPMI_OCP 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_INTEL_GMA_OPREGION_2_0=y
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -603,32 +450,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -671,25 +521,18 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
CONFIG_HAVE_PIRQ_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
@@ -699,6 +542,7 @@ CONFIG_GENERATE_PIRQ_TABLE=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -716,7 +560,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -726,6 +569,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -734,6 +579,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -751,25 +597,15 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
-# CONFIG_SPD_CACHE_IN_FMAP is not set
+# end of Debugging
+
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/coreboot/x60_16mb/config/libgfxinit_txtmode b/resources/coreboot/x60_16mb/config/libgfxinit_txtmode
index e9a37967..1e490ac1 100644
--- a/resources/coreboot/x60_16mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/x60_16mb/config/libgfxinit_txtmode
@@ -15,6 +15,7 @@ CONFIG_COMPILER_GCC=y
# CONFIG_CCACHE is not set
# CONFIG_FMD_GENPARSER is not set
# CONFIG_UTIL_GENPARSER is not set
+# CONFIG_OPTION_BACKEND_NONE is not set
CONFIG_USE_OPTION_TABLE=y
CONFIG_STATIC_OPTION_TABLE=y
CONFIG_COMPRESS_RAMSTAGE=y
@@ -26,16 +27,14 @@ CONFIG_USE_BLOBS=y
# CONFIG_USE_QC_BLOBS is not set
# CONFIG_COVERAGE is not set
# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
# CONFIG_ASAN is not set
# CONFIG_NO_STAGE_CACHE is not set
CONFIG_TSEG_STAGE_CACHE=y
# CONFIG_UPDATE_IMAGE is not set
# CONFIG_BOOTSPLASH_IMAGE is not set
# CONFIG_FW_CONFIG is not set
+# end of General setup
#
# Mainboard
@@ -121,6 +120,8 @@ CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
CONFIG_POST_IO=y
CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
+CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
CONFIG_UART_FOR_CONSOLE=0
# CONFIG_CONSOLE_POST is not set
@@ -131,16 +132,14 @@ CONFIG_DCACHE_RAM_BASE=0xfefc0000
CONFIG_DCACHE_RAM_SIZE=0x8000
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MMCONF_BUS_NUMBER=64
+CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xf0000000
+CONFIG_ECAM_MMCONF_BUS_NUMBER=64
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DRIVERS_INTEL_WIFI=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
CONFIG_CONSOLE_SERIAL=y
-# CONFIG_PCIEXP_HOTPLUG is not set
-CONFIG_CBFS_MCACHE_SIZE=0x2000
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X60"
# CONFIG_BOARD_LENOVO_G505S is not set
# CONFIG_BOARD_LENOVO_L520 is not set
@@ -165,6 +164,7 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X60"
# CONFIG_BOARD_LENOVO_Z61T is not set
# CONFIG_BOARD_LENOVO_R60 is not set
# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
+# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
# CONFIG_BOARD_LENOVO_X131E is not set
# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
# CONFIG_BOARD_LENOVO_X200 is not set
@@ -181,8 +181,6 @@ CONFIG_PS2K_EISAID="PNP0303"
CONFIG_PS2M_EISAID="IBM3780"
CONFIG_THINKPADEC_HKEY_EISAID="IBM0068"
CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
# CONFIG_PCIEXP_L1_SUB_STATE is not set
# CONFIG_PCIEXP_CLK_PM is not set
CONFIG_DRIVERS_UART_8250IO=y
@@ -210,11 +208,9 @@ CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
+# end of Mainboard
+
CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
#
# Chipset
@@ -223,68 +219,44 @@ CONFIG_SYSTEM_TYPE_LAPTOP=y
#
# SoC
#
+CONFIG_ARCH_ALL_STAGES_X86=y
CONFIG_CHIPSET_DEVICETREE=""
+CONFIG_CBFS_MCACHE_SIZE=0x4000
CONFIG_ROMSTAGE_ADDR=0x2000000
CONFIG_VERSTAGE_ADDR=0x2000000
CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
CONFIG_SMM_RESERVED_SIZE=0x100000
CONFIG_SMM_MODULE_STACK_SIZE=0x400
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
CONFIG_EHCI_BAR=0xfef00000
-# CONFIG_SOC_CAVIUM_CN81XX is not set
+CONFIG_CBFS_CACHE_ALIGN=8
CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
CONFIG_INTEL_GMA_BCLV_WIDTH=16
CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
CONFIG_INTEL_GMA_BCLM_WIDTH=16
-# CONFIG_PCIEXP_ASPM is not set
-# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed14000
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
CONFIG_FIXED_EPBAR_MMIO_BASE=0xfed19000
+CONFIG_AZALIA_MAX_CODECS=3
+# CONFIG_PCIEXP_ASPM is not set
+# CONFIG_PCIEXP_COMMON_CLOCK is not set
CONFIG_TTYS0_BASE=0x3f8
CONFIG_TTYS0_LCS=3
CONFIG_UART_PCI_ADDR=0x0
-CONFIG_AZALIA_MAX_CODECS=3
CONFIG_INTEL_HAS_TOP_SWAP=y
# CONFIG_INTEL_ADD_TOP_SWAP_BOOTBLOCK is not set
CONFIG_INTEL_TOP_SWAP_BOOTBLOCK_SIZE=0x10000
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_MEDIATEK_MT8195 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
#
# CPU
#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
CONFIG_CPU_INTEL_MODEL_6EX=y
CONFIG_CPU_INTEL_MODEL_6FX=y
CONFIG_SOCKET_SPECIFIC_OPTIONS=y
CONFIG_CPU_INTEL_SOCKET_M=y
CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
CONFIG_CPU_INTEL_COMMON=y
CONFIG_ENABLE_VMX=y
CONFIG_SET_IA32_FC_LOCK_BIT=y
@@ -292,33 +264,25 @@ CONFIG_SET_MSR_AESNI_LOCK_BIT=y
CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
CONFIG_CPU_INTEL_COMMON_SMM=y
CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
+CONFIG_XAPIC_ONLY=y
+# CONFIG_X2APIC_ONLY is not set
+# CONFIG_X2APIC_RUNTIME is not set
CONFIG_UDELAY_TSC=y
CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
CONFIG_TSC_SYNC_MFENCE=y
CONFIG_SETUP_XIP_CACHE=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=y
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_RESERVE_MTRRS_FOR_OS is not set
+CONFIG_CPU_INFO_V2=y
CONFIG_SMP=y
CONFIG_MMX=y
CONFIG_SSE=y
CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
@@ -327,22 +291,16 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
#
# Northbridge
#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
CONFIG_NORTHBRIDGE_SPECIFIC_OPTIONS=y
CONFIG_NORTHBRIDGE_INTEL_I945=y
-# CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC is not set
CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM=y
CONFIG_I945_LVDS=y
-# CONFIG_OVERRIDE_CLOCK_DISABLE is not set
-# CONFIG_CHECK_SLFRCS_ON_RESUME is not set
#
# Southbridge
#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
CONFIG_HPET_MIN_TICKS=0x80
+# CONFIG_PCIEXP_HOTPLUG is not set
CONFIG_SOUTHBRIDGE_INTEL_I82801GX=y
CONFIG_SOUTHBRIDGE_RICOH_RL5C476=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
@@ -350,20 +308,16 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_ME is not set
CONFIG_SOUTHBRIDGE_INTEL_COMMON_HPET=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7=y
-# 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=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
-# CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE is not set
CONFIG_INTEL_CHIPSET_LOCKDOWN=y
CONFIG_SOUTHBRIDGE_INTEL_COMMON_WATCHDOG=y
CONFIG_FIXED_RCBA_MMIO_BASE=0xfed1c000
@@ -373,10 +327,6 @@ CONFIG_FIXED_SMBUS_IO_BASE=0x400
#
# Super I/O
#
-# 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
CONFIG_SUPERIO_NSC_COMMON_PRE_RAM=y
CONFIG_SUPERIO_NSC_PC87382=y
CONFIG_SUPERIO_NSC_PC87392=y
@@ -385,25 +335,11 @@ CONFIG_SUPERIO_NSC_PC87392=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
CONFIG_EC_LENOVO_H8=y
# CONFIG_H8_BEEP_ON_DEATH is not set
# CONFIG_H8_FLASH_LEDS_ON_DEATH is not set
# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
-# CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL is not set
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
CONFIG_EC_LENOVO_PMH7=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
CONFIG_ARCH_X86=y
CONFIG_ARCH_BOOTBLOCK_X86_32=y
CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -411,31 +347,19 @@ CONFIG_ARCH_ROMSTAGE_X86_32=y
CONFIG_ARCH_POSTCAR_X86_32=y
CONFIG_ARCH_RAMSTAGE_X86_32=y
CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_USE_MARCH_586 is not set
CONFIG_AP_IN_SIPI_WAIT=y
-# CONFIG_SIPI_VECTOR_IN_ROM is not set
CONFIG_RAMTOP=0x1000000
+CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
CONFIG_NUM_IPI_STARTS=2
CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
CONFIG_HPET_ADDRESS=0xfed00000
CONFIG_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_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
+# end of Chipset
#
# Devices
@@ -443,28 +367,24 @@ CONFIG_HAVE_CF9_RESET=y
CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT=y
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-# CONFIG_VGA_ROM_RUN_DEFAULT is not set
-# CONFIG_MAINBOARD_HAS_LIBGFXINIT is not set
CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
# CONFIG_VGA_ROM_RUN is not set
# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
#
# Display
#
CONFIG_VGA_TEXT_FRAMEBUFFER=y
# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
+# end of Display
+
CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
+CONFIG_ECAM_MMCONF_SUPPORT=y
CONFIG_PCIX_PLUGIN_SUPPORT=y
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
CONFIG_AZALIA_PLUGIN_SUPPORT=y
-# CONFIG_AZALIA_LOCK_DOWN_R_WO_GCAP is not set
CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_MMCONF_LENGTH=0x04000000
+CONFIG_ECAM_MMCONF_LENGTH=0x04000000
CONFIG_PCI_ALLOW_BUS_MASTER=y
CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
@@ -474,35 +394,22 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
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
-# CONFIG_XHCI_UTILS is not set
+# end of Devices
#
# Generic Drivers
#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
CONFIG_DRIVERS_LENOVO_WACOM=y
CONFIG_DIGITIZER_AUTODETECT=y
# CONFIG_DIGITIZER_PRESENT is not set
# CONFIG_DIGITIZER_ABSENT 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 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
CONFIG_SPI_FLASH=y
-# CONFIG_SPI_SDCARD is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_NO_EARLY_WRITES is not set
CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY=y
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
# CONFIG_SPI_FLASH_NO_FAST_READ is not set
CONFIG_SPI_FLASH_ADESTO=y
CONFIG_SPI_FLASH_AMIC=y
@@ -513,86 +420,26 @@ CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
CONFIG_DRIVERS_UART=y
-# CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
-# CONFIG_NO_UART_ON_SUPERIO is not set
-# 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_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=y
-# CONFIG_HAVE_USBDEBUG_OPTIONS is not set
# CONFIG_USBDEBUG is not set
# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
CONFIG_DRIVERS_I2C_CK505=y
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_DRIVERS_I2C_TAS5825M is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
CONFIG_INTEL_EDID=y
CONFIG_INTEL_INT15=y
CONFIG_INTEL_GMA_ACPI=y
CONFIG_INTEL_GMA_SSC_ALTERNATE_REF=y
-# 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_IPMI_OCP 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_INTEL_GMA_OPREGION_2_0=y
# CONFIG_DRIVERS_PS2_KEYBOARD is not set
CONFIG_DRIVERS_MC146818=y
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+# CONFIG_USE_PC_CMOS_ALTCENTURY is not set
CONFIG_VGA=y
-# CONFIG_DRIVERS_RICOH_RCE822 is not set
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_MP_SERVICES_PPI_V1 is not set
-# CONFIG_MP_SERVICES_PPI_V2 is not set
-# CONFIG_COMMONLIB_STORAGE is not set
+# end of Generic Drivers
#
# Security
@@ -601,32 +448,35 @@ CONFIG_DRIVERS_WIFI_GENERIC=y
#
# Verified Boot (vboot)
#
+# end of Verified Boot (vboot)
#
# Trusted Platform Module
#
-CONFIG_USER_NO_TPM=y
+CONFIG_NO_TPM=y
+# end of Trusted Platform Module
#
# Memory initialization
#
CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=y
+# end of Memory initialization
+
# 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_BOOTMEDIA_SMM_BWP is not set
+# end of Security
+
CONFIG_ACPI_HAVE_PCAT_8259=y
CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
CONFIG_ACPI_SOC_NVS=y
-# CONFIG_ACPI_EINJ is not set
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
CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-# CONFIG_RTC is not set
#
# Console
@@ -669,25 +519,18 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
CONFIG_POST_DEVICE_NONE=y
# CONFIG_POST_DEVICE_LPC is not set
# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
CONFIG_HWBASE_DEBUG_NULL=y
+# end of Console
+
CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
CONFIG_IOAPIC=y
CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
CONFIG_HAVE_MP_TABLE=y
CONFIG_HAVE_PIRQ_TABLE=y
-# CONFIG_ACPI_NHLT is not set
#
# System tables
@@ -697,6 +540,7 @@ CONFIG_GENERATE_PIRQ_TABLE=y
CONFIG_GENERATE_SMBIOS_TABLES=y
CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
+# end of System tables
#
# Payload
@@ -714,7 +558,6 @@ CONFIG_PAYLOAD_NONE=y
# CONFIG_PAYLOAD_TIANOCORE is not set
CONFIG_PAYLOAD_OPTIONS=""
# CONFIG_PXE is not set
-# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
@@ -724,6 +567,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
# CONFIG_TINT_SECONDARY_PAYLOAD is not set
+# end of Secondary Payloads
+# end of Payload
#
# Debugging
@@ -732,6 +577,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
#
# CPU Debug Settings
#
+# CONFIG_DISPLAY_MTRRS is not set
#
# BLOB Debug Settings
@@ -749,25 +595,15 @@ CONFIG_HAVE_DEBUG_RAM_SETUP=y
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_RESOURCES is not set
# CONFIG_DEBUG_CONSOLE_INIT is not set
# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
# CONFIG_DEBUG_BOOT_STATE is not set
# CONFIG_DEBUG_ADA_CODE is not set
# CONFIG_HAVE_EM100_SUPPORT is not set
-# CONFIG_SPD_CACHE_IN_FMAP is not set
+# end of Debugging
+
CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
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_HAVE_BOOTBLOCK=y
CONFIG_HAVE_ROMSTAGE=y
diff --git a/resources/grub/config/grub.cfg b/resources/grub/config/grub.cfg
index ef3c8a48..89f50f31 100644
--- a/resources/grub/config/grub.cfg
+++ b/resources/grub/config/grub.cfg
@@ -239,12 +239,6 @@ menuentry 'Poweroff [p]' --hotkey='p' {
menuentry 'Reboot [r]' --hotkey='r' {
reboot
}
-if [ -f (cbfsdisk)/tianocore.elf ]; then
-menuentry 'Load Tianocore UEFI payload' {
- set root='cbfsdisk'
- chainloader /tianocore.elf
-}
-fi
if [ -f (cbfsdisk)/img/memtest ]; then
menuentry 'Load MemTest86+ [m]' --hotkey='m' {
set root='cbfsdisk'
diff --git a/resources/scripts/build/boot/roms_helper b/resources/scripts/build/boot/roms_helper
index 1936c4d8..5c109c82 100755
--- a/resources/scripts/build/boot/roms_helper
+++ b/resources/scripts/build/boot/roms_helper
@@ -54,10 +54,8 @@ arch="undefined"
# board.cfg files have to specifically enable [a] payload(s)
payload_grub="n"
payload_grub_withseabios="n" # seabios chainloaded from grub
-payload_grub_withtianocore="n" # tianocore chainloaded from grub
payload_seabios="n"
payload_seabios_withgrub="n" # i386-coreboot grub accessible from SeaBIOS boot menu
-payload_tianocore="n"
seabios_opromloadonly="0"
payload_memtest="n"
# Override the above defaults using board.cfg
@@ -79,8 +77,7 @@ if [ "${payload_memtest}" != "n" ] && \
[ "${payload_memtest}" != "y" ]; then
payload_memtest="n"
fi
-if [ "${payload_grub_withseabios}" = "y" ] \
- || [ "${payload_grub_withtianocore}" = "y" ]; then
+if [ "${payload_grub_withseabios}" = "y" ]; then
payload_grub="y"
fi
if [ "${payload_grub_withseabios}" = "y" ]; then
@@ -93,11 +90,7 @@ fi
# NOTE: reverse logic must not be applied. If SeaBIOS-with-GRUB works, that doesn't
# necessarily mean GRUB-with-SeaBIOS will work nicely. for example, the board might
# only have an add-on GPU available, where it's recommended to boot SeaBIOS first
-if [ "${payload_grub_withtianocore}" = "y" ]; then
- payload_tianocore="y"
-fi
-if [ "${payload_grub}" != "y" ] && [ "${payload_seabios}" != "y" ] \
- && [ "${payload_tianocore}" != "y" ]; then
+if [ "${payload_grub}" != "y" ] && [ "${payload_seabios}" != "y" ]; then
while true; do
for configfile in "resources/coreboot/${board}/config/"*; do
if [ -f "${configfile}" ]; then
@@ -123,7 +116,6 @@ fi
cbfstool="${cbdir}/util/cbfstool/cbfstool"
corebootrom="${cbdir}/build/coreboot.rom"
seavgabiosrom="payload/seabios/seavgabios.bin"
-tianocoreelf="payload/tianocore/tianocore.elf"
if [ ! -d "${cbdir}" ]; then
./download coreboot ${cbtree}
@@ -140,24 +132,10 @@ if [ "${arch}" = "x86_32" ] || [ "${arch}" = "x86_64" ]; then
fi
fi
-if [ "${arch}" != "x86_64" ]; then
- payload_tianocore="n"
- payload_grub_withtianocore="n"
-fi
-
if [ ! -f "${cbfstool}" ]; then
./build module cbutils ${cbtree}
fi
-if [ ! -f "${tianocoreelf}" ]; then
- if [ "${payload_tianocore}" = "y" ]; then
- ./build payload tianocore
- elif [ "${payload_grub}" = "y" ] \
- && [ "${payload_grub_withtianocore}" = "y" ]; then
- ./build payload tianocore
- fi
-fi
-
if [ ! -f "${seavgabiosrom}" ] \
|| [ ! -f payload/seabios/seabios_libgfxinit.elf ] \
|| [ ! -f payload/seabios/seabios_vgarom.elf ]; then
@@ -276,20 +254,6 @@ mkCoreboot() {
)
}
-mkRomWithTianocoreOnly() {
- rompath="${1}"
- initmode="${2}"
- if [ "${payload_tianocore}" = "y" ] && [ "${arch}" = "x86_64" ]; then
- # do not include on 32-bit-only machines. this is 64-bit tianocore
-
- tmprom=$(mktemp -t coreboot_rom.XXXXXXXXXX)
- cp "${corebootrom}" "${tmprom}"
- "${cbfstool}" "${tmprom}" add-payload -f ${tianocoreelf} -n fallback/payload -c lzma
- moverom "${tmprom}" "${romdir}/tianocore_${board}_${initmode}.rom" "${romtype}"
- rm -f "${tmprom}"
- fi
-}
-
# make a rom in /tmp/ and then print the path of that ROM
make_seabios_rom() {
target_cbrom="${1}" # rom to insert seabios in. this rom won't be touched
@@ -365,10 +329,6 @@ mkRomsWithGrub() {
displaymode="${3}"
firstpayloadname="${4}" # allow values: grub, seabios, seabios_withgrub, seabios_grubfirst
- if [ "${payload_grub_withtianocore}" = "y" ] && [ "${firstpayloadname}" = "grub" ]; then
- "${cbfstool}" "${tmprompath}" add-payload -f ${tianocoreelf} -n tianocore.elf -c lzma
- fi
-
if [ "${payload_grub_withseabios}" = "y" ] && [ "${firstpayloadname}" = "grub" ]; then
mv "$(make_seabios_rom "${tmprompath}" "seabios.elf" "${seabios_opromloadonly}" "${initmode}" "${cbfstool}")" "${tmprompath}"
elif [ "${payload_seabios_withgrub}" ] && [ "${firstpayloadname}" != "grub" ]; then
@@ -409,10 +369,9 @@ mkRomsWithGrub() {
# Main ROM building function. This calls all other functions
mkRoms() {
- tianocoreRequiredDisplayMode="${1}"
- cbcfgpath="${2}"
- displaymode="${3}"
- initmode="${4}"
+ cbcfgpath="${1}"
+ displaymode="${2}"
+ initmode="${3}"
if [ ! -f "${cbcfgpath}" ]; then
printf "'%s' does not exist. Skipping build for %s %s %s\n" \
@@ -422,10 +381,6 @@ mkRoms() {
mkCoreboot "${cbdir}" "${cbcfgpath}"
- if [ "${displaymode}" = "${tianocoreRequiredDisplayMode}" ]; then
- mkRomWithTianocoreOnly "${corebootrom}" "${initmode}"
- fi
-
if [ "${displaymode}" = "txtmode" ] && [ "${payload_memtest}" = "y" ]; then
"${cbfstool}" "${corebootrom}" add-payload -f memtest86plus/memtest -n img/memtest -c lzma
fi
@@ -457,24 +412,21 @@ mkRoms() {
}
initmode="libgfxinit"
-tianocoreRequiredDisplayMode="corebootfb"
for displaymode in corebootfb txtmode; do
cbcfgpath="resources/coreboot/${board}/config/${initmode}_${displaymode}"
- mkRoms "${tianocoreRequiredDisplayMode}" "${cbcfgpath}" "${displaymode}" "${initmode}"
+ mkRoms "${cbcfgpath}" "${displaymode}" "${initmode}"
done
initmode="vgarom"
-tianocoreRequiredDisplayMode="vesafb"
for displaymode in vesafb txtmode; do
cbcfgpath="resources/coreboot/${board}/config/${initmode}_${displaymode}"
- mkRoms "${tianocoreRequiredDisplayMode}" "${cbcfgpath}" "${displaymode}" "${initmode}"
+ mkRoms "${cbcfgpath}" "${displaymode}" "${initmode}"
done
initmode="normal"
displaymode="txtmode"
-tianocoreRequiredDisplayMode="unsupported"
cbcfgpath="resources/coreboot/${board}/config/${initmode}"
-mkRoms "${tianocoreRequiredDisplayMode}" "${cbcfgpath}" "${displaymode}" "${initmode}"
+mkRoms "${cbcfgpath}" "${displaymode}" "${initmode}"
(
cd "${cbdir}"
diff --git a/resources/scripts/build/clean/tianocore b/resources/scripts/build/clean/tianocore
deleted file mode 100755
index a3ac119e..00000000
--- a/resources/scripts/build/clean/tianocore
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (C) 2020 Leah Rowe <info@minifree.org>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-# This script assumes that the current working directory is the root
-# of git or release archive
-
-[ "x${DEBUG+set}" = 'xset' ] && set -v
-set -u -e
-
-if [ -d "coreboot/default/payloads/external/tianocore/tianocore" ]; then
- (
- cd "coreboot/default/payloads/external/tianocore/"
- make clean
- )
-fi
diff --git a/resources/scripts/build/payload/tianocore b/resources/scripts/build/payload/tianocore
deleted file mode 100755
index f8bff805..00000000
--- a/resources/scripts/build/payload/tianocore
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/bin/env bash
-
-# helper script: builds Tianocore source code
-#
-# Copyright (C) 2020, 2021 Leah Rowe <info@minifree.org>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-[ "x${DEBUG+set}" = 'xset' ] && set -v
-set -u -e
-
-printf "Building Tianocore\n"
-
-[ ! -d "payload/" ] && mkdir -p payload/
-[ ! -d "payload/tianocore/" ] && mkdir -p payload/tianocore/
-
-rm -f payload/tianocore/*
-
-if [ ! -d "coreboot/default/" ]; then
- ./download coreboot default
- ./build module cbutils default
-fi
-
-if [ ! -d "coreboot/default/util/crossgcc/xgcc/i386-elf" ]; then
- (
- # cat version coreboot/default/.coreboot-version -> breaks the build process; this file is not available, at the moment
-
- cd coreboot/default/
- make crossgcc-i386 CPUS=$(nproc) # tianocore actually uses host gcc, which means
- # right now you should be building this on a 64-bit x86 host.
- # It does not currently use coreboot crossgcc. However, a dummy coreboot
- # ROM is compiled using Tianocore in order to derive tianocore.elf
-
- # and of course, that implies crossgcc. tianocore is only really use
- # on x86, so we only care about i386 crossgcc here
- )
-fi
-
-if [ ! -d "coreboot/default/payloads/external/tianocore/tianocore/" ]; then
- ./download tianocore
-fi
-
-(
-cd coreboot/default/payloads/external/tianocore/
-make clean
-)
-
-(
-cd coreboot/default/
-make distclean
-cp ../../resources/tianocore/dummy.coreboot.config .config
-make -j$(nproc)
-)
-
-cp coreboot/default/payloads/external/tianocore/tianocore/Build/UEFIPAYLOAD.fd \
- payload/tianocore/tianocore.elf
-
-(
-cd coreboot/default/
-make distclean
-)
-
-(
-cd coreboot/default/payloads/external/tianocore/
-make clean
-)
-
diff --git a/resources/scripts/build/release/src b/resources/scripts/build/release/src
index 700b3d6c..8dcf0ec8 100755
--- a/resources/scripts/build/release/src
+++ b/resources/scripts/build/release/src
@@ -94,13 +94,6 @@ done
rm -Rf coreboot/coreboot/
rm -Rf .git* */.git* coreboot/*/.git* coreboot/*/3rdparty/*/.git*
rm -Rf coreboot/*/util/nvidia/cbootimage/.git*
- rm -Rf coreboot/*/payloads/external/tianocore/tianocore/.git*
- rm -Rf coreboot/*/payloads/external/tianocore/tianocore/CryptoPkg/Library/OpensslLib/openssl/.git*
- rm -Rf coreboot/*/payloads/external/tianocore/tianocore/ArmPkg/Library/ArmSoftFloatLib/"berkeley-softfloat-3"/.git*
- rm -Rf coreboot/*/payloads/external/tianocore/tianocore/UnitTestFrameworkPkg/Library/CmockaLib/cmocka/.git*
- rm -Rf coreboot/*/payloads/external/tianocore/tianocore/MdeModulePkg/Universal/RegularExpressionDxe/oniguruma/.git*
- rm -Rf coreboot/*/payloads/external/tianocore/tianocore/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/.git*
- rm -Rf coreboot/*/payloads/external/tianocore/tianocore/BaseTools/Source/C/BrotliCompress/brotli/.git*
)
(
diff --git a/resources/scripts/download/tianocore b/resources/scripts/download/tianocore
deleted file mode 100755
index f58bf799..00000000
--- a/resources/scripts/download/tianocore
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (C) 2020 Leah Rowe <info@minifree.org>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-[ "x${DEBUG+set}" = 'xset' ] && set -v
-set -u -e
-
-printf "Downloading Tianocore\n"
-
-if [ ! -d "coreboot/default/" ]; then
- ./download coreboot default
-fi
-
-(
- cd "coreboot/default/payloads/external/tianocore/"
- rm -Rf tianocore
- make download && make update
-)
-
diff --git a/resources/scripts/update/tianocore/configs b/resources/scripts/update/tianocore/configs
deleted file mode 100755
index d0c00c4b..00000000
--- a/resources/scripts/update/tianocore/configs
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env bash
-
-#
-# helper script: update coreboot configs (run make oldconfig)
-#
-# Copyright (C) 2021 Leah Rowe <info@minifree.org>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-# This script assumes that the working directory is the root
-# of git or release archive
-
-[ "x${DEBUG+set}" = 'xset' ] && set -v
-set -u -e
-
-printf "Updating tianocore dummy config\n"
-
-# Build ROM images for supported boards
-cbtree="default"
-
-if [ ! -d coreboot/${cbtree} ]; then
- ./download coreboot ${cbtree}
-fi
-
-(
-cd coreboot/${cbtree}/
-rm -f .config*
-make distclean
-)
-mv resources/tianocore/dummy.coreboot.config coreboot/${cbtree}/.config
-(
-cd coreboot/${cbtree}/
-make oldconfig
-)
-mv coreboot/${cbtree}/.config resources/tianocore/dummy.coreboot.config
-rm -f coreboot/${cbtree}/.config*
-(
-cd coreboot/${cbtree}/
-make distclean
-)
-
-printf "\n\n"
-
diff --git a/resources/tianocore/dummy.coreboot.config b/resources/tianocore/dummy.coreboot.config
deleted file mode 100644
index 9ca3fed5..00000000
--- a/resources/tianocore/dummy.coreboot.config
+++ /dev/null
@@ -1,791 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# coreboot configuration
-#
-
-#
-# General setup
-#
-CONFIG_COREBOOT_BUILD=y
-CONFIG_LOCALVERSION=""
-CONFIG_CBFS_PREFIX="fallback"
-CONFIG_COMPILER_GCC=y
-# CONFIG_COMPILER_LLVM_CLANG is not set
-# CONFIG_ANY_TOOLCHAIN is not set
-# CONFIG_CCACHE is not set
-# CONFIG_FMD_GENPARSER is not set
-# CONFIG_UTIL_GENPARSER is not set
-CONFIG_USE_OPTION_TABLE=y
-CONFIG_STATIC_OPTION_TABLE=y
-CONFIG_COMPRESS_RAMSTAGE=y
-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_USE_QC_BLOBS is not set
-# CONFIG_COVERAGE is not set
-# CONFIG_UBSAN is not set
-# CONFIG_HAVE_ASAN_IN_ROMSTAGE is not set
-# CONFIG_ASAN_IN_ROMSTAGE is not set
-CONFIG_HAVE_ASAN_IN_RAMSTAGE=y
-# CONFIG_ASAN_IN_RAMSTAGE is not set
-# CONFIG_ASAN is not set
-# CONFIG_NO_STAGE_CACHE is not set
-CONFIG_TSEG_STAGE_CACHE=y
-# CONFIG_UPDATE_IMAGE is not set
-# CONFIG_BOOTSPLASH_IMAGE is not set
-# CONFIG_FW_CONFIG is not set
-
-#
-# Mainboard
-#
-
-#
-# Important: Run 'make distclean' before switching boards
-#
-# CONFIG_VENDOR_51NB is not set
-# CONFIG_VENDOR_ACER is not set
-# CONFIG_VENDOR_ADLINK 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_BAP is not set
-# CONFIG_VENDOR_BIOSTAR is not set
-# CONFIG_VENDOR_BOSTENTECH is not set
-# CONFIG_VENDOR_CAVIUM is not set
-# CONFIG_VENDOR_CLEVO 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_EXAMPLE is not set
-# CONFIG_VENDOR_FACEBOOK is not set
-# CONFIG_VENDOR_FOXCONN is not set
-# CONFIG_VENDOR_GETAC is not set
-# CONFIG_VENDOR_GIGABYTE is not set
-# CONFIG_VENDOR_GIZMOSPHERE is not set
-# CONFIG_VENDOR_GOOGLE is not set
-# CONFIG_VENDOR_HP is not set
-# CONFIG_VENDOR_IBASE is not set
-# CONFIG_VENDOR_INTEL is not set
-# CONFIG_VENDOR_JETWAY is not set
-# CONFIG_VENDOR_KONTRON is not set
-CONFIG_VENDOR_LENOVO=y
-# CONFIG_VENDOR_LIBRETREND is not set
-# CONFIG_VENDOR_LIPPERT is not set
-# CONFIG_VENDOR_MSI is not set
-# CONFIG_VENDOR_OCP is not set
-# CONFIG_VENDOR_OPENCELLULAR is not set
-# CONFIG_VENDOR_PACKARDBELL is not set
-# CONFIG_VENDOR_PCENGINES is not set
-# CONFIG_VENDOR_PORTWELL is not set
-# CONFIG_VENDOR_PRODRIVE 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
-# CONFIG_VENDOR_SAMSUNG is not set
-# CONFIG_VENDOR_SAPPHIRE is not set
-# CONFIG_VENDOR_SCALEWAY is not set
-# CONFIG_VENDOR_SIEMENS is not set
-# CONFIG_VENDOR_SIFIVE is not set
-# CONFIG_VENDOR_SUPERMICRO is not set
-# CONFIG_VENDOR_SYSTEM76 is not set
-# CONFIG_VENDOR_TI is not set
-# CONFIG_VENDOR_UP is not set
-CONFIG_BOARD_SPECIFIC_OPTIONS=y
-CONFIG_MAINBOARD_FAMILY="ThinkPad X230"
-CONFIG_MAINBOARD_PART_NUMBER="ThinkPad X230"
-CONFIG_MAINBOARD_VERSION="1.0"
-CONFIG_MAINBOARD_DIR="lenovo/x230"
-CONFIG_MAX_CPUS=8
-CONFIG_VGA_BIOS_ID="8086,0166"
-CONFIG_DIMM_MAX=4
-CONFIG_DIMM_SPD_SIZE=256
-CONFIG_FMDFILE=""
-# CONFIG_NO_POST is not set
-CONFIG_MAINBOARD_VENDOR="LENOVO"
-# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
-# CONFIG_VGA_BIOS is not set
-CONFIG_CBFS_SIZE=0x700000
-CONFIG_VARIANT_DIR="x230"
-CONFIG_DEVICETREE="devicetree.cb"
-CONFIG_VGA_BIOS_FILE="pci8086,0166.rom"
-CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
-CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="LENOVO"
-CONFIG_DRAM_RESET_GATE_GPIO=10
-CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
-CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
-CONFIG_POST_IO=y
-CONFIG_USBDEBUG_HCD_INDEX=2
-CONFIG_OVERRIDE_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
-CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
-# CONFIG_CONSOLE_POST is not set
-CONFIG_TPM_PIRQ=0x0
-CONFIG_POST_DEVICE=y
-# CONFIG_VBOOT is not set
-CONFIG_LINEAR_FRAMEBUFFER_MAX_WIDTH=2560
-CONFIG_LINEAR_FRAMEBUFFER_MAX_HEIGHT=1600
-CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
-CONFIG_VBOOT_VBNV_OFFSET=0x2a
-CONFIG_DCACHE_RAM_BASE=0xfefe0000
-CONFIG_DCACHE_RAM_SIZE=0x20000
-CONFIG_DCACHE_BSP_STACK_SIZE=0x10000
-CONFIG_MMCONF_BASE_ADDRESS=0xf0000000
-CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
-CONFIG_HAVE_INTEL_FIRMWARE=y
-CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
-CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
-CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_TPM_INIT=y
-CONFIG_DRIVERS_INTEL_WIFI=y
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X230"
-# CONFIG_HAVE_IFD_BIN is not set
-# CONFIG_BOARD_LENOVO_G505S is not set
-# CONFIG_BOARD_LENOVO_L520 is not set
-# CONFIG_BOARD_LENOVO_S230U is not set
-# CONFIG_BOARD_LENOVO_T400 is not set
-# CONFIG_BOARD_LENOVO_T500 is not set
-# CONFIG_BOARD_LENOVO_R400 is not set
-# CONFIG_BOARD_LENOVO_R500 is not set
-# CONFIG_BOARD_LENOVO_W500 is not set
-# CONFIG_BOARD_LENOVO_T410 is not set
-# CONFIG_BOARD_LENOVO_T420 is not set
-# CONFIG_BOARD_LENOVO_T420S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T430 is not set
-# CONFIG_BOARD_LENOVO_T430S is not set
-# CONFIG_BOARD_LENOVO_T431S is not set
-# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
-# CONFIG_BOARD_LENOVO_T520 is not set
-# CONFIG_BOARD_LENOVO_W520 is not set
-# CONFIG_BOARD_LENOVO_T530 is not set
-# CONFIG_BOARD_LENOVO_W530 is not set
-# CONFIG_BOARD_LENOVO_T60 is not set
-# CONFIG_BOARD_LENOVO_Z61T is not set
-# CONFIG_BOARD_LENOVO_R60 is not set
-# CONFIG_BOARD_LENOVO_THINKCENTRE_A58 is not set
-# CONFIG_BOARD_LENOVO_X131E is not set
-# CONFIG_BOARD_LENOVO_X1_CARBON_GEN1 is not set
-# CONFIG_BOARD_LENOVO_X200 is not set
-# CONFIG_BOARD_LENOVO_X301 is not set
-# CONFIG_BOARD_LENOVO_X201 is not set
-# CONFIG_BOARD_LENOVO_X220 is not set
-# CONFIG_BOARD_LENOVO_X220I is not set
-# CONFIG_BOARD_LENOVO_X1 is not set
-CONFIG_BOARD_LENOVO_X230=y
-# CONFIG_BOARD_LENOVO_X230T is not set
-# CONFIG_BOARD_LENOVO_X230S is not set
-# CONFIG_BOARD_LENOVO_X60 is not set
-CONFIG_PS2K_EISAID="PNP0303"
-CONFIG_PS2M_EISAID="LEN0020"
-CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
-CONFIG_VBOOT_SLOTS_RW_AB=y
-CONFIG_DRIVER_LENOVO_SERIALS=y
-# CONFIG_BOARD_LENOVO_BASEBOARD_T520 is not set
-# CONFIG_BOARD_LENOVO_BASEBOARD_T530 is not set
-# CONFIG_PCIEXP_L1_SUB_STATE is not set
-# CONFIG_PCIEXP_CLK_PM is not set
-# CONFIG_DRIVERS_UART_8250IO is not set
-CONFIG_HEAP_SIZE=0x4000
-CONFIG_BOARD_ROMSIZE_KB_12288=y
-# CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
-# CONFIG_COREBOOT_ROMSIZE_KB_512 is not set
-# 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 is not set
-# CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
-CONFIG_COREBOOT_ROMSIZE_KB_12288=y
-# CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
-# CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
-# CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
-CONFIG_COREBOOT_ROMSIZE_KB=12288
-CONFIG_ROM_SIZE=0x00c00000
-CONFIG_HAVE_POWER_STATE_AFTER_FAILURE=y
-CONFIG_HAVE_POWER_STATE_PREVIOUS_AFTER_FAILURE=y
-CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
-# CONFIG_POWER_STATE_ON_AFTER_FAILURE is not set
-# CONFIG_POWER_STATE_PREVIOUS_AFTER_FAILURE is not set
-CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
-CONFIG_SYSTEM_TYPE_LAPTOP=y
-# CONFIG_SYSTEM_TYPE_TABLET is not set
-# CONFIG_SYSTEM_TYPE_DETACHABLE is not set
-# CONFIG_SYSTEM_TYPE_CONVERTIBLE is not set
-# CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
-
-#
-# Chipset
-#
-
-#
-# SoC
-#
-CONFIG_ROMSTAGE_ADDR=0x2000000
-CONFIG_RAMBASE=0xe00000
-CONFIG_CPU_ADDR_BITS=36
-CONFIG_CPU_SPECIFIC_OPTIONS=y
-CONFIG_VERSTAGE_ADDR=0x2000000
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
-CONFIG_EHCI_BAR=0xfef00000
-CONFIG_SERIRQ_CONTINUOUS_MODE=y
-CONFIG_SMM_TSEG_SIZE=0x800000
-CONFIG_SMM_RESERVED_SIZE=0x100000
-CONFIG_SMM_MODULE_STACK_SIZE=0x400
-CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
-# CONFIG_SOC_CAVIUM_CN81XX is not set
-CONFIG_ARCH_ARMV8_EXTENSION=0
-CONFIG_STACK_SIZE=0x1000
-# CONFIG_SOC_CAVIUM_COMMON is not set
-CONFIG_CHIPSET_DEVICETREE=""
-CONFIG_IED_REGION_SIZE=0x400000
-# CONFIG_SOC_INTEL_GEMINILAKE is not set
-CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
-CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
-CONFIG_PCIEXP_ASPM=y
-CONFIG_PCIEXP_COMMON_CLOCK=y
-CONFIG_UART_PCI_ADDR=0x0
-CONFIG_VBT_DATA_SIZE_KB=8
-# CONFIG_SOC_MEDIATEK_MT8173 is not set
-# CONFIG_SOC_MEDIATEK_MT8183 is not set
-# CONFIG_SOC_MEDIATEK_MT8192 is not set
-# CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA210 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
-# CONFIG_SOC_ROCKCHIP_RK3288 is not set
-# CONFIG_SOC_ROCKCHIP_RK3399 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
-# CONFIG_CPU_SAMSUNG_EXYNOS5420 is not set
-# CONFIG_SOC_TI_AM335X is not set
-# CONFIG_SOC_UCB_RISCV is not set
-
-#
-# CPU
-#
-# CONFIG_CPU_AMD_AGESA is not set
-# CONFIG_CPU_AMD_PI is not set
-# CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
-CONFIG_CPU_INTEL_MODEL_206AX=y
-CONFIG_SSE2=y
-# CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE is not set
-# CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
-CONFIG_CPU_INTEL_COMMON=y
-CONFIG_ENABLE_VMX=y
-CONFIG_SET_IA32_FC_LOCK_BIT=y
-CONFIG_SET_MSR_AESNI_LOCK_BIT=y
-CONFIG_CPU_INTEL_COMMON_TIMEBASE=y
-CONFIG_CPU_INTEL_COMMON_SMM=y
-CONFIG_MICROCODE_UPDATE_PRE_RAM=y
-# CONFIG_PARALLEL_CPU_INIT is not set
-CONFIG_PARALLEL_MP=y
-# CONFIG_PARALLEL_MP_AP_WORK is not set
-# CONFIG_UDELAY_LAPIC is not set
-CONFIG_UDELAY_TSC=y
-CONFIG_TSC_MONOTONIC_TIMER=y
-# CONFIG_TSC_SYNC_LFENCE is not set
-CONFIG_TSC_SYNC_MFENCE=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_X86_SMM_LOADER_VERSION2 is not set
-# CONFIG_SMM_LAPIC_REMAP_MITIGATION is not set
-# CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
-# CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_X86_AMD_INIT_SIPI is not set
-# CONFIG_SOC_SETS_MSRS is not set
-CONFIG_SMP=y
-CONFIG_MMX=y
-CONFIG_SSE=y
-CONFIG_SUPPORT_CPU_UCODE_IN_CBFS=y
-# CONFIG_USES_MICROCODE_HEADER_FILES is not set
-# CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS is not set
-# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS is not set
-# CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER is not set
-CONFIG_CPU_MICROCODE_CBFS_NONE=y
-
-#
-# Northbridge
-#
-# CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NORTHBRIDGE_AMD_PI is not set
-CONFIG_INTEL_GMA_BCLV_OFFSET=0x48254
-CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
-CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE=y
-# CONFIG_SANDYBRIDGE_VBOOT_IN_ROMSTAGE is not set
-CONFIG_USE_NATIVE_RAMINIT=y
-# CONFIG_NATIVE_RAMINIT_IGNORE_MAX_MEM_FUSES is not set
-# CONFIG_NATIVE_RAMINIT_IGNORE_XMP_MAX_DIMMS is not set
-# CONFIG_RAMINIT_ALWAYS_ALLOW_DLL_OFF is not set
-CONFIG_RAMINIT_ENABLE_ECC=y
-
-#
-# Southbridge
-#
-# CONFIG_AMD_SB_CIMX is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
-CONFIG_SOUTHBRIDGE_INTEL_C216=y
-CONFIG_SOUTH_BRIDGE_OPTIONS=y
-CONFIG_HPET_MIN_TICKS=0x80
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_RESET=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_RTC=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMBASE=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_SILVERMONT is not set
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ=y
-CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_ACPI_MADT=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_FINALIZE=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG=y
-CONFIG_INTEL_DESCRIPTOR_MODE_CAPABLE=y
-CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
-# CONFIG_VALIDATE_INTEL_DESCRIPTOR is not set
-CONFIG_INTEL_CHIPSET_LOCKDOWN=y
-CONFIG_SOUTHBRIDGE_INTEL_COMMON_WATCHDOG=y
-CONFIG_FIXED_SMBUS_IO_BASE=0x400
-
-#
-# Super I/O
-#
-# 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
-CONFIG_EC_LENOVO_H8=y
-CONFIG_H8_BEEP_ON_DEATH=y
-CONFIG_H8_FLASH_LEDS_ON_DEATH=y
-# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
-CONFIG_H8_HAS_BAT_TRESHOLDS_IMPL=y
-# CONFIG_H8_HAS_PRIMARY_FN_KEYS is not set
-CONFIG_EC_LENOVO_PMH7=y
-
-#
-# Intel Firmware
-#
-# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
-CONFIG_MAINBOARD_USES_IFD_GBE_REGION=y
-# CONFIG_MAINBOARD_USES_IFD_EC_REGION is not set
-# CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION is not set
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
-CONFIG_UNLOCK_FLASH_REGIONS=y
-# CONFIG_CAVIUM_BDK is not set
-# CONFIG_MAINBOARD_HAS_CHROMEOS is not set
-# CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
-# CONFIG_UEFI_2_4_BINDING is not set
-# CONFIG_UDK_2015_BINDING is not set
-# CONFIG_UDK_2017_BINDING is not set
-# CONFIG_UDK_202005_BINDING is not set
-# CONFIG_USE_SIEMENS_HWILIB is not set
-# CONFIG_ARM_LPAE is not set
-CONFIG_ARCH_X86=y
-CONFIG_ARCH_BOOTBLOCK_X86_32=y
-CONFIG_ARCH_VERSTAGE_X86_32=y
-CONFIG_ARCH_ROMSTAGE_X86_32=y
-CONFIG_ARCH_POSTCAR_X86_32=y
-CONFIG_ARCH_RAMSTAGE_X86_32=y
-CONFIG_ARCH_ALL_STAGES_X86_32=y
-# CONFIG_ARCH_POSTCAR_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_RAMTOP=0x1000000
-CONFIG_NUM_IPI_STARTS=2
-CONFIG_CBFS_MCACHE_SIZE=0x2000
-CONFIG_PC80_SYSTEM=y
-# CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
-CONFIG_HAVE_CMOS_DEFAULT=y
-CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
-CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
-# CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS is not set
-# CONFIG_HPET_ADDRESS_OVERRIDE is not set
-CONFIG_HPET_ADDRESS=0xfed00000
-CONFIG_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_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
-#
-CONFIG_HAVE_VGA_TEXT_FRAMEBUFFER=y
-CONFIG_HAVE_LINEAR_FRAMEBUFFER=y
-# CONFIG_MAINBOARD_HAS_NATIVE_VGA_INIT is not set
-# CONFIG_MAINBOARD_FORCE_NATIVE_VGA_INIT is not set
-CONFIG_MAINBOARD_HAS_LIBGFXINIT=y
-CONFIG_MAINBOARD_USE_LIBGFXINIT=y
-# CONFIG_VGA_ROM_RUN is not set
-# CONFIG_NO_GFX_INIT is not set
-# CONFIG_MULTIPLE_VGA_ADAPTERS is not set
-
-#
-# Display
-#
-CONFIG_WANT_LINEAR_FRAMEBUFFER=y
-# CONFIG_VGA_TEXT_FRAMEBUFFER is not set
-CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
-CONFIG_LINEAR_FRAMEBUFFER=y
-# CONFIG_BOOTSPLASH is not set
-CONFIG_PCI=y
-# CONFIG_NO_MMCONF_SUPPORT is not set
-CONFIG_MMCONF_SUPPORT=y
-CONFIG_PCIX_PLUGIN_SUPPORT=y
-CONFIG_CARDBUS_PLUGIN_SUPPORT=y
-CONFIG_AZALIA_PLUGIN_SUPPORT=y
-CONFIG_PCIEXP_PLUGIN_SUPPORT=y
-CONFIG_PCI_ALLOW_BUS_MASTER=y
-CONFIG_PCI_SET_BUS_MASTER_PCI_BRIDGES=y
-CONFIG_PCI_ALLOW_BUS_MASTER_ANY_DEVICE=y
-# CONFIG_PCIEXP_HOTPLUG is not set
-# 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
-# CONFIG_RESOURCE_ALLOCATOR_V3 is not set
-CONFIG_RESOURCE_ALLOCATOR_V4=y
-# CONFIG_XHCI_UTILS is not set
-
-#
-# Generic Drivers
-#
-# CONFIG_DRIVERS_AS3722_RTC is not set
-# CONFIG_CHROMEOS_CAMERA is not set
-CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
-# CONFIG_MAINBOARD_HAS_CRB_TPM is not set
-# CONFIG_ELOG is not set
-# CONFIG_GIC is not set
-# CONFIG_IPMI_KCS is not set
-# CONFIG_DRIVERS_LENOVO_WACOM is not set
-CONFIG_CACHE_MRC_SETTINGS=y
-# CONFIG_MRC_SETTINGS_PROTECT is not set
-# CONFIG_HAS_RECOVERY_MRC_CACHE is not set
-# CONFIG_MRC_SETTINGS_VARIABLE_DATA is not set
-# CONFIG_MRC_WRITE_NV_LATE is not set
-CONFIG_MRC_STASH_TO_CBMEM=y
-# 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_V2 is not set
-# CONFIG_SMMSTORE_IN_CBFS is not set
-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_NO_EARLY_WRITES=y
-# CONFIG_BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY is not set
-# CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS is not set
-CONFIG_SPI_FLASH_SMM=y
-# CONFIG_SPI_FLASH_NO_FAST_READ is not set
-CONFIG_SPI_FLASH_ADESTO=y
-CONFIG_SPI_FLASH_AMIC=y
-CONFIG_SPI_FLASH_ATMEL=y
-CONFIG_SPI_FLASH_EON=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_SPI_FLASH_SST=y
-CONFIG_SPI_FLASH_STMICRO=y
-# CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
-# CONFIG_HAVE_EM100PRO_SPI_CONSOLE_SUPPORT is not set
-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_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=y
-CONFIG_HAVE_USBDEBUG_OPTIONS=y
-# CONFIG_USBDEBUG is not set
-# CONFIG_VPD is not set
-# CONFIG_DRIVERS_AMD_PI is not set
-# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
-# CONFIG_DRIVERS_GENESYSLOGIC_GL9755 is not set
-# CONFIG_DRIVERS_GFX_GENERIC is not set
-# CONFIG_DRIVERS_I2C_GPIO_MUX 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
-# CONFIG_DRIVERS_I2C_SX9310 is not set
-# CONFIG_DRIVERS_I2C_SX9324 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
-# CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
-# CONFIG_DRIVER_I2C_TPM_ACPI is not set
-# CONFIG_DRIVERS_INTEL_DPTF is not set
-# CONFIG_PLATFORM_USES_FSP2_0 is not set
-# CONFIG_PLATFORM_USES_FSP2_1 is not set
-# CONFIG_PLATFORM_USES_FSP2_2 is not set
-# CONFIG_INTEL_DDI is not set
-# CONFIG_INTEL_EDID is not set
-CONFIG_INTEL_INT15=y
-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_GFX_GMA_IGNORE_PRESENCE_STRAPS is not set
-CONFIG_GFX_GMA=y
-# CONFIG_GFX_GMA_PANEL_1_ON_EDP is not set
-CONFIG_GFX_GMA_PANEL_1_ON_LVDS=y
-CONFIG_GFX_GMA_DYN_CPU=y
-CONFIG_GFX_GMA_GENERATION="Ironlake"
-CONFIG_GFX_GMA_PANEL_1_PORT="LVDS"
-CONFIG_GFX_GMA_PANEL_2_PORT="Disabled"
-CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC"
-# 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_IPMI_OCP is not set
-# CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
-# CONFIG_DRIVER_MAXIM_MAX77686 is not set
-CONFIG_FRU_DEVICE_ID=0
-# CONFIG_DRIVER_PARADE_PS8625 is not set
-# CONFIG_DRIVER_PARADE_PS8640 is not set
-CONFIG_DRIVERS_PS2_KEYBOARD=y
-CONFIG_DRIVERS_MC146818=y
-CONFIG_MAINBOARD_HAS_LPC_TPM=y
-CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
-CONFIG_DRIVERS_RICOH_RCE822=y
-# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
-# 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_DRIVERS_TI_SN65DSI86BRIDGE is not set
-# CONFIG_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913_RTC is not set
-# CONFIG_DRIVERS_USB_ACPI is not set
-# CONFIG_DRIVERS_USB_PCI_XHCI is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
-# CONFIG_USE_SAR is not set
-# CONFIG_COMMONLIB_STORAGE is not set
-
-#
-# Security
-#
-
-#
-# Verified Boot (vboot)
-#
-
-#
-# Trusted Platform Module
-#
-CONFIG_TPM1=y
-CONFIG_MAINBOARD_HAS_TPM1=y
-# CONFIG_TPM_DEACTIVATE is not set
-# CONFIG_DEBUG_TPM is not set
-# CONFIG_TPM_RDRESP_NEED_DELAY is not set
-# CONFIG_TPM_MEASURED_BOOT is not set
-
-#
-# Memory initialization
-#
-CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
-CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT=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
-CONFIG_BOOT_DEVICE_SUPPORTS_WRITES=y
-CONFIG_RTC=y
-
-#
-# Console
-#
-CONFIG_BOOTBLOCK_CONSOLE=y
-CONFIG_POSTCAR_CONSOLE=y
-CONFIG_SQUELCH_EARLY_SMP=y
-# 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 is not set
-# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
-# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5 is not set
-# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_4 is not set
-# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_3 is not set
-# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_2 is not set
-# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL=0
-# CONFIG_CMOS_POST is not set
-CONFIG_POST_DEVICE_NONE=y
-# CONFIG_POST_DEVICE_LPC is not set
-# CONFIG_POST_DEVICE_PCI_PCIE is not set
-# CONFIG_DEFAULT_POST_ON_LPC is not set
-CONFIG_POST_IO_PORT=0x80
-# CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
-# CONFIG_HWBASE_DEBUG_CB is not set
-CONFIG_HWBASE_DEBUG_NULL=y
-CONFIG_HAVE_ACPI_RESUME=y
-# CONFIG_DISABLE_ACPI_HIBERNATE is not set
-CONFIG_RESUME_PATH_SAME_AS_BOOT=y
-# CONFIG_NO_MONOTONIC_TIMER is not set
-CONFIG_HAVE_MONOTONIC_TIMER=y
-# CONFIG_TIMER_QUEUE is not set
-CONFIG_HAVE_OPTION_TABLE=y
-# CONFIG_PCI_IO_CFG_EXT is not set
-CONFIG_IOAPIC=y
-CONFIG_USE_WATCHDOG_ON_BOOT=y
-# CONFIG_GFXUMA is not set
-# CONFIG_ACPI_NHLT is not set
-
-#
-# System tables
-#
-# CONFIG_GENERATE_MP_TABLE is not set
-# CONFIG_GENERATE_PIRQ_TABLE is not set
-CONFIG_GENERATE_SMBIOS_TABLES=y
-CONFIG_SMBIOS_PROVIDED_BY_MOBO=y
-CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
-
-#
-# Payload
-#
-# CONFIG_PAYLOAD_NONE is not set
-# CONFIG_PAYLOAD_ELF is not set
-# CONFIG_PAYLOAD_BOOTBOOT is not set
-# CONFIG_PAYLOAD_FILO is not set
-# CONFIG_PAYLOAD_GRUB2 is not set
-# CONFIG_PAYLOAD_LINUXBOOT is not set
-# CONFIG_PAYLOAD_SEABIOS is not set
-# CONFIG_PAYLOAD_UBOOT is not set
-# CONFIG_PAYLOAD_YABITS is not set
-# CONFIG_PAYLOAD_LINUX is not set
-CONFIG_PAYLOAD_TIANOCORE=y
-CONFIG_PAYLOAD_FILE="payloads/external/tianocore/tianocore/Build/UEFIPAYLOAD.fd"
-CONFIG_PAYLOAD_OPTIONS=""
-# CONFIG_PXE is not set
-CONFIG_TIANOCORE_COREBOOTPAYLOAD=y
-# CONFIG_TIANOCORE_UEFIPAYLOAD is not set
-CONFIG_TIANOCORE_REVISION_ID=""
-# CONFIG_TIANOCORE_TARGET_IA32 is not set
-CONFIG_TIANOCORE_TARGET_X64=y
-# CONFIG_TIANOCORE_DEBUG is not set
-CONFIG_TIANOCORE_RELEASE=y
-CONFIG_TIANOCORE_USE_8254_TIMER=y
-# CONFIG_TIANOCORE_BOOTSPLASH_IMAGE 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
-CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
-
-#
-# Secondary Payloads
-#
-# CONFIG_COREINFO_SECONDARY_PAYLOAD is not set
-# CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
-# CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
-# CONFIG_TINT_SECONDARY_PAYLOAD is not set
-
-#
-# Debugging
-#
-
-#
-# CPU Debug Settings
-#
-
-#
-# BLOB Debug Settings
-#
-
-#
-# General Debug Settings
-#
-# CONFIG_FATAL_ASSERTS is not set
-# CONFIG_DEBUG_CBFS is not set
-CONFIG_HAVE_DEBUG_RAM_SETUP=y
-# CONFIG_DEBUG_RAM_SETUP 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_RESOURCES is not set
-# CONFIG_DEBUG_CONSOLE_INIT is not set
-# CONFIG_DEBUG_SPI_FLASH is not set
-# CONFIG_DEBUG_FUNC is not set
-# CONFIG_DEBUG_BOOT_STATE is not set
-# CONFIG_DEBUG_ADA_CODE is not set
-# CONFIG_HAVE_EM100_SUPPORT is not set
-CONFIG_RAMSTAGE_ADA=y
-CONFIG_RAMSTAGE_LIBHWBASE=y
-# CONFIG_SPD_CACHE_IN_FMAP is not set
-CONFIG_HWBASE_DYNAMIC_MMIO=y
-CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
-CONFIG_HWBASE_DIRECT_PCIDEV=y
-CONFIG_WARNINGS_ARE_ERRORS=y
-# CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
-# CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_ENABLE is not set
-# CONFIG_POWER_BUTTON_FORCE_DISABLE is not set
-# CONFIG_POWER_BUTTON_IS_OPTIONAL is not set
-# CONFIG_REG_SCRIPT is not set
-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_HAVE_BOOTBLOCK=y
-CONFIG_HAVE_ROMSTAGE=y
-CONFIG_HAVE_RAMSTAGE=y