update coreboot and nuke tianocore20211122

tianocore is a liability for the libreboot project. it's a bloated mess, and
unreliable, broken on many boards, and basically impossible to audit.

i don't trust tianocore, so i'm removing it.

1 files changed, 47 insertions, 217 deletions

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