Update coreboot and configs

models/qemu/coreboot.config

@@ -23,11 +23,11 @@ CONFIG_COLLECT_TIMESTAMPS=y
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
 # CONFIG_UBSAN is not set
-CONFIG_RELOCATABLE_RAMSTAGE=y
 CONFIG_NO_STAGE_CACHE=y
 # CONFIG_CBMEM_STAGE_CACHE is not set
 # CONFIG_UPDATE_IMAGE is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
+# CONFIG_FW_CONFIG is not set
 
 #
 # Mainboard
@@ -70,6 +70,7 @@ CONFIG_VENDOR_EMULATION=y
 # 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
@@ -96,12 +97,12 @@ CONFIG_FMDFILE=""
 CONFIG_MAINBOARD_VENDOR="Emulation"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 CONFIG_VGA_BIOS=y
+CONFIG_CBFS_SIZE=0x800000
+CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_VGA_BIOS_FILE="${FIRMWARE_OPEN_MODEL_DIR}/vga.rom"
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x4000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Emulation"
-CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
-CONFIG_CBFS_SIZE=0x800000
 # CONFIG_POST_IO is not set
 CONFIG_OVERRIDE_DEVICETREE=""
 CONFIG_UART_FOR_CONSOLE=2
@@ -113,6 +114,7 @@ CONFIG_BOARD_EMULATION_QEMU_X86_Q35=y
 # 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 is not set
 CONFIG_VBOOT_VBNV_OFFSET=0x2c
 CONFIG_DCACHE_RAM_BASE=0x10000
@@ -131,11 +133,11 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="QEMU x86 q35/ich9"
 CONFIG_PS2K_EISAID="PNP0303"
 CONFIG_PS2M_EISAID="PNP0F13"
-CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_PCIEXP_L1_SUB_STATE is not set
-CONFIG_SMBIOS_ENCLOSURE_TYPE=0x03
-CONFIG_HEAP_SIZE=0x4000
+# CONFIG_PCIEXP_CLK_PM is not set
 # CONFIG_CONSOLE_POST is not set
+CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_HEAP_SIZE=0x4000
 CONFIG_POST_DEVICE=y
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
@@ -176,21 +178,23 @@ CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
 #
 # SoC
 #
-CONFIG_CPU_ADDR_BITS=36
+CONFIG_X86_RESET_VECTOR=0xfffffff0
+CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
+CONFIG_RAMBASE=0xe00000
+CONFIG_CPU_ADDR_BITS=36
+# CONFIG_VGA_BIOS_SECOND is not set
+# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
 CONFIG_EHCI_BAR=0xfef00000
 CONFIG_ACPI_CPU_STRING="\\_SB.CP%02d"
-CONFIG_X86_RESET_VECTOR=0xfffffff0
 # CONFIG_SOC_CAVIUM_CN81XX is not set
 CONFIG_ARCH_ARMV8_EXTENSION=0
 CONFIG_STACK_SIZE=0x1000
 # CONFIG_SOC_CAVIUM_COMMON is not set
 # CONFIG_SOC_INTEL_GLK is not set
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
-CONFIG_ROMSTAGE_ADDR=0x2000000
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_COMMON_CLOCK is not set
-# CONFIG_PCIEXP_CLK_PM is not set
 CONFIG_TTYS0_BASE=0x3e8
 CONFIG_TTYS0_LCS=3
 CONFIG_UART_PCI_ADDR=0x0
@@ -229,8 +233,6 @@ CONFIG_UNKNOWN_TSC_RATE=y
 CONFIG_TSC_MONOTONIC_TIMER=y
 # CONFIG_TSC_SYNC_LFENCE is not set
 # CONFIG_TSC_SYNC_MFENCE is not set
-# CONFIG_NO_FIXED_XIP_ROM_SIZE is not set
-CONFIG_XIP_ROM_SIZE=0x10000
 CONFIG_LOGICAL_CPUS=y
 CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_NO_SMM is not set
@@ -303,6 +305,7 @@ CONFIG_MAINBOARD_HAS_CHROMEOS=y
 # 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
@@ -315,10 +318,8 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_USE_MARCH_586 is not set
 # CONFIG_AP_IN_SIPI_WAIT is not set
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
-CONFIG_RAMBASE=0xe00000
 CONFIG_RAMTOP=0x1000000
 CONFIG_NUM_IPI_STARTS=2
-# CONFIG_CBMEM_TOP_BACKUP is not set
 CONFIG_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
 CONFIG_HAVE_CMOS_DEFAULT=y
@@ -372,12 +373,11 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_ABOVE_4G=y
 # CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G is not set
 CONFIG_PCIEXP_HOTPLUG_IO=0x2000
 # CONFIG_EARLY_PCI_BRIDGE is not set
-# CONFIG_VGA_BIOS_SECOND is not set
-# CONFIG_CHECK_REV_IN_OPROM_NAME is not set
 # CONFIG_VGA_BIOS_DGPU 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
 
 #
 # Generic Drivers
@@ -433,8 +433,10 @@ CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_YRES=768
 # 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_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
@@ -450,13 +452,13 @@ CONFIG_INTEL_GMA_BCLM_WIDTH=16
 # CONFIG_HAVE_INTEL_PTT 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 is not set
 CONFIG_DRIVERS_MC146818=y
-CONFIG_LPC_TPM=y
-CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
 CONFIG_MAINBOARD_HAS_LPC_TPM=y
+CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
 CONFIG_VGA=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
 # CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
@@ -468,6 +470,7 @@ CONFIG_VGA=y
 # 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_COMMONLIB_STORAGE is not set
 
 #
@@ -560,7 +563,6 @@ CONFIG_HAVE_OPTION_TABLE=y
 CONFIG_IOAPIC=y
 CONFIG_USE_WATCHDOG_ON_BOOT=y
 # CONFIG_GFXUMA is not set
-# CONFIG_COMMON_FADT is not set
 # CONFIG_ACPI_NHLT is not set
 
 #