Update coreboot and model configs

models/qemu/coreboot.config

@@ -23,8 +23,9 @@ CONFIG_COLLECT_TIMESTAMPS=y
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
 # CONFIG_UBSAN is not set
-# CONFIG_NO_RELOCATABLE_RAMSTAGE 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
 
@@ -35,22 +36,18 @@ CONFIG_RELOCATABLE_RAMSTAGE=y
 #
 # Important: Run 'make distclean' before switching boards
 #
-# CONFIG_VENDOR_ADI is not set
 # CONFIG_VENDOR_ADLINK is not set
-# CONFIG_VENDOR_ADVANSUS 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_AVALUE is not set
 # CONFIG_VENDOR_BAP is not set
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_CAVIUM is not set
 # CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_ELMEX is not set
 CONFIG_VENDOR_EMULATION=y
-# CONFIG_VENDOR_ESD is not set
 # CONFIG_VENDOR_FACEBOOK is not set
 # CONFIG_VENDOR_FOXCONN is not set
 # CONFIG_VENDOR_GETAC is not set
@@ -59,14 +56,12 @@ CONFIG_VENDOR_EMULATION=y
 # CONFIG_VENDOR_GOOGLE is not set
 # CONFIG_VENDOR_HP is not set
 # CONFIG_VENDOR_IBASE is not set
-# CONFIG_VENDOR_IEI is not set
 # CONFIG_VENDOR_INTEL is not set
 # CONFIG_VENDOR_JETWAY is not set
 # CONFIG_VENDOR_KONTRON is not set
 # CONFIG_VENDOR_LENOVO 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
@@ -82,32 +77,26 @@ CONFIG_VENDOR_EMULATION=y
 # CONFIG_VENDOR_SUPERMICRO is not set
 # CONFIG_VENDOR_SYSTEM76 is not set
 # CONFIG_VENDOR_TI is not set
-# CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_UP is not set
-# CONFIG_VENDOR_VIA is not set
+CONFIG_MAINBOARD_VENDOR="Emulation"
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="emulation/qemu-q35"
 CONFIG_MAINBOARD_PART_NUMBER="QEMU x86 q35/ich9"
 CONFIG_MAX_CPUS=1
-CONFIG_CBFS_SIZE=0x800000
-CONFIG_UART_FOR_CONSOLE=2
-CONFIG_MAINBOARD_VENDOR="Emulation"
-CONFIG_VGA_BIOS_ID="1106,3230"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 CONFIG_DIMM_SPD_SIZE=256
 CONFIG_VGA_BIOS=y
+CONFIG_VGA_BIOS_ID="1106,3230"
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
 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_BOOTBLOCK_MAINBOARD_INIT="mainboard/emulation/qemu-q35/bootblock.c"
-CONFIG_DCACHE_RAM_BASE=0x10000
-CONFIG_DCACHE_RAM_SIZE=0x90000
-CONFIG_MAX_REBOOT_CNT=3
 CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_UART_FOR_CONSOLE=2
 CONFIG_FMDFILE=""
 # CONFIG_BOARD_EMULATION_QEMU_AARCH64 is not set
 # CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
@@ -118,25 +107,25 @@ CONFIG_BOARD_EMULATION_QEMU_X86_Q35=y
 # CONFIG_BOARD_EMULATION_QEMU_RISCV_RV32 is not set
 # CONFIG_BOARD_EMULATION_SPIKE_RISCV is not set
 CONFIG_BOARD_EMULATION_QEMU_X86=y
+# CONFIG_VBOOT is not set
+CONFIG_VBOOT_VBNV_OFFSET=0x2c
+CONFIG_DCACHE_RAM_BASE=0x10000
+CONFIG_DCACHE_RAM_SIZE=0x90000
 CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
 CONFIG_MMCONF_BASE_ADDRESS=0xb0000000
 # CONFIG_HAVE_INTEL_FIRMWARE is not set
-CONFIG_POST_DEVICE=y
 CONFIG_DRIVERS_INTEL_WIFI=y
-# CONFIG_VBOOT is not set
-CONFIG_DRIVERS_UART_8250IO=y
 CONFIG_DIMM_MAX=4
-CONFIG_TTYS0_LCS=3
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="QEMU x86 q35/ich9"
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7
-# CONFIG_USBDEBUG is not set
 CONFIG_MAINBOARD_VERSION="1.0"
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
+CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_PCIEXP_L1_SUB_STATE is not set
 # CONFIG_NO_POST is not set
 CONFIG_SMBIOS_ENCLOSURE_TYPE=0x03
 CONFIG_HEAP_SIZE=0x4000
 # CONFIG_CONSOLE_POST is not set
+CONFIG_POST_DEVICE=y
 CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
 CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 CONFIG_BOARD_ROMSIZE_KB_2048=y
@@ -147,6 +136,7 @@ CONFIG_BOARD_ROMSIZE_KB_2048=y
 # CONFIG_COREBOOT_ROMSIZE_KB_1024 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_2048 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_4096 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_5120 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_6144 is not set
 CONFIG_COREBOOT_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_10240 is not set
@@ -191,7 +181,7 @@ CONFIG_VERSTAGE_ADDR=0x2000000
 # CONFIG_PCIEXP_COMMON_CLOCK is not set
 # CONFIG_PCIEXP_CLK_PM is not set
 CONFIG_TTYS0_BASE=0x3e8
-CONFIG_HPET_MIN_TICKS=0x80
+CONFIG_TTYS0_LCS=3
 CONFIG_UART_PCI_ADDR=0x0
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_MEDIATEK_MT8183 is not set
@@ -212,8 +202,6 @@ CONFIG_UART_PCI_ADDR=0x0
 #
 # CPU
 #
-CONFIG_XIP_ROM_SIZE=0x10000
-CONFIG_NUM_IPI_STARTS=2
 # CONFIG_CPU_AMD_AGESA is not set
 # CONFIG_CPU_AMD_PI is not set
 # CONFIG_CPU_ARMLTD_CORTEX_A9 is not set
@@ -231,6 +219,7 @@ 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
@@ -241,7 +230,6 @@ CONFIG_SMM_ASEG=y
 # CONFIG_X86_AMD_INIT_SIPI is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
 # CONFIG_SOC_SETS_MSRS is not set
-# CONFIG_CAR_GLOBAL_MIGRATION is not set
 CONFIG_SMP=y
 # CONFIG_SUPPORT_CPU_UCODE_IN_CBFS is not set
 # CONFIG_USES_MICROCODE_HEADER_FILES is not set
@@ -257,18 +245,22 @@ CONFIG_SMP=y
 #
 # CONFIG_AMD_SB_CIMX is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
-# CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
-CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
+CONFIG_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_SMBUS=y
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SPI_ICH7 is not set
+# 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 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM=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
@@ -293,10 +285,6 @@ CONFIG_SOUTHBRIDGE_INTEL_I82801IX=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_2013_VERSION=2013
-CONFIG_UDK_2015_VERSION=2015
-CONFIG_UDK_2017_VERSION=2017
-CONFIG_UDK_VERSION=2013
 # CONFIG_USE_SIEMENS_HWILIB is not set
 # CONFIG_ARM_LPAE is not set
 CONFIG_ARCH_X86=y
@@ -305,18 +293,15 @@ 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_BOOTBLOCK_X86_64 is not set
-# CONFIG_ARCH_VERSTAGE_X86_64 is not set
-# CONFIG_ARCH_ROMSTAGE_X86_64 is not set
 # CONFIG_ARCH_POSTCAR_X86_64 is not set
-# CONFIG_ARCH_RAMSTAGE_X86_64 is not set
 # CONFIG_USE_MARCH_586 is not set
 # CONFIG_AP_IN_SIPI_WAIT is not set
+CONFIG_X86_RESET_VECTOR=0xfffffff0
 # 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_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
 # CONFIG_HAVE_CMOS_DEFAULT is not set
@@ -327,6 +312,8 @@ CONFIG_ID_SECTION_OFFSET=0x80
 CONFIG_POSTCAR_STAGE=y
 # CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
 # CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
+CONFIG_BOOTBLOCK_SIMPLE=y
+# CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_ACPI_HAVE_PCAT_8259=y
 # CONFIG_COLLECT_TIMESTAMPS_NO_TSC is not set
 CONFIG_COLLECT_TIMESTAMPS_TSC=y
@@ -353,16 +340,21 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
 CONFIG_LINEAR_FRAMEBUFFER=y
 # CONFIG_BOOTSPLASH is not set
-# CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
 CONFIG_PCI=y
 # CONFIG_NO_MMCONF_SUPPORT is not set
 CONFIG_MMCONF_SUPPORT=y
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
+CONFIG_HT_CHAIN_UNITID_BASE=0
+CONFIG_HT_CHAIN_END_UNITID_BASE=0
 CONFIG_PCIX_PLUGIN_SUPPORT=y
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_PCIEXP_HOTPLUG=y
+CONFIG_PCIEXP_HOTPLUG_BUSES=32
+CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
+CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
+CONFIG_PCIEXP_HOTPLUG_IO=0x2000
 # CONFIG_EARLY_PCI_BRIDGE is not set
 # CONFIG_VGA_BIOS_DGPU is not set
 # CONFIG_SOFTWARE_I2C is not set
@@ -380,6 +372,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
 # CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SMMSTORE_IN_CBFS is not set
 # CONFIG_SPI_FLASH is not set
+# CONFIG_SPI_SDCARD is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
 CONFIG_DRIVERS_UART=y
 # CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set
@@ -394,6 +387,7 @@ CONFIG_DRIVERS_UART=y
 # 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_GENERIC_WIFI=y
 # CONFIG_USE_SAR is not set
@@ -401,10 +395,13 @@ CONFIG_DRIVERS_GENERIC_WIFI=y
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS=y
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_XRES=1024
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_YRES=768
+# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
+# CONFIG_DRIVERS_GENERIC_GFX is not set
 # CONFIG_DRIVERS_I2C_MAX98373 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
@@ -413,7 +410,6 @@ 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_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_PLATFORM_USES_FSP2_0 is not set
 # CONFIG_PLATFORM_USES_FSP2_1 is not set
 # CONFIG_INTEL_DDI is not set
@@ -429,8 +425,6 @@ CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_YRES=768
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
-# CONFIG_UDELAY_IO is not set
-# CONFIG_UDELAY_TIMER2 is not set
 CONFIG_DRIVERS_MC146818=y
 # CONFIG_LPC_TPM is not set
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
@@ -464,10 +458,6 @@ CONFIG_USER_NO_TPM=y
 #
 CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
 # CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT is not set
-
-#
-# Intel
-#
 # CONFIG_ACPI_SATA_GENERATOR is not set
 CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
 # CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
@@ -516,16 +506,16 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_2 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
+CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7
 # 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_NO_EARLY_BOOTBLOCK_POSTCODES is not set
 CONFIG_HWBASE_DEBUG_CB=y
 # CONFIG_HAVE_ACPI_RESUME is not set
-# CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK is not set
-# CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK is not set
-# CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK is not set
+# CONFIG_DISABLE_ACPI_HIBERNATE is not set
 # CONFIG_NO_MONOTONIC_TIMER is not set
 CONFIG_HAVE_MONOTONIC_TIMER=y
 # CONFIG_TIMER_QUEUE is not set
@@ -551,7 +541,6 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
-# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_LINUXBOOT is not set
@@ -585,6 +574,10 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
 #
 # CONFIG_DEBUG_SMM_RELOCATION is not set
 
+#
+# BLOB Debug Settings
+#
+
 #
 # General Debug Settings
 #
@@ -596,13 +589,11 @@ 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_ACPI is not set
 # CONFIG_DEBUG_CONSOLE_INIT is not set
 # CONFIG_TRACE 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_CBMEM_TOP_ARG=y
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
@@ -611,10 +602,9 @@ CONFIG_WARNINGS_ARE_ERRORS=y
 # 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_NO_STAGE_CACHE=y
-CONFIG_C_ENVIRONMENT_BOOTBLOCK=y
 CONFIG_HAVE_ROMSTAGE=y
 CONFIG_HAVE_RAMSTAGE=y