From fe234e1a893d1f1305b34164a28e36d069050827 Mon Sep 17 00:00:00 2001
From: Tim Crawford <tcrawford@system76.com>
Date: Wed, 17 Jun 2020 16:51:53 -0600
Subject: [PATCH] Update coreboot config for qemu

---
 models/qemu/coreboot.config | 101 ++++++++++++++++++++++++------------
 1 file changed, 68 insertions(+), 33 deletions(-)

diff --git a/models/qemu/coreboot.config b/models/qemu/coreboot.config
index ac3b327..56a2506 100644
--- a/models/qemu/coreboot.config
+++ b/models/qemu/coreboot.config
@@ -36,6 +36,7 @@ CONFIG_NO_STAGE_CACHE=y
 #
 # Important: Run 'make distclean' before switching boards
 #
+# CONFIG_VENDOR_51NB is not set
 # CONFIG_VENDOR_ADLINK is not set
 # CONFIG_VENDOR_AMD is not set
 # CONFIG_VENDOR_AOPEN is not set
@@ -46,6 +47,7 @@ CONFIG_NO_STAGE_CACHE=y
 # CONFIG_VENDOR_BIOSTAR is not set
 # CONFIG_VENDOR_CAVIUM is not set
 # CONFIG_VENDOR_COMPULAB is not set
+# CONFIG_VENDOR_DELL is not set
 # CONFIG_VENDOR_ELMEX is not set
 CONFIG_VENDOR_EMULATION=y
 # CONFIG_VENDOR_FACEBOOK is not set
@@ -60,12 +62,15 @@ CONFIG_VENDOR_EMULATION=y
 # CONFIG_VENDOR_JETWAY is not set
 # CONFIG_VENDOR_KONTRON is not set
 # CONFIG_VENDOR_LENOVO is not set
+# 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_PROTECTLI is not set
 # CONFIG_VENDOR_PURISM is not set
 # CONFIG_VENDOR_RAZER is not set
 # CONFIG_VENDOR_RODA is not set
@@ -78,16 +83,19 @@ CONFIG_VENDOR_EMULATION=y
 # CONFIG_VENDOR_SYSTEM76 is not set
 # CONFIG_VENDOR_TI is not set
 # CONFIG_VENDOR_UP 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_MAINBOARD_VERSION="1.0"
+CONFIG_MAINBOARD_DIR="emulation/qemu-q35"
 CONFIG_MAX_CPUS=1
-# 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_DIMM_MAX=4
+CONFIG_DIMM_SPD_SIZE=256
+CONFIG_FMDFILE=""
+# CONFIG_NO_POST is not set
+CONFIG_MAINBOARD_VENDOR="Emulation"
+# CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
+CONFIG_VGA_BIOS=y
 CONFIG_VGA_BIOS_FILE="${FIRMWARE_OPEN_MODEL_DIR}/vga.rom"
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x4000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Emulation"
@@ -97,7 +105,6 @@ CONFIG_CBFS_SIZE=0x800000
 # CONFIG_POST_IO is not set
 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
 # CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
@@ -106,22 +113,26 @@ 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_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_MAX_ACPI_TABLE_SIZE_KB=224
 # CONFIG_HAVE_INTEL_FIRMWARE is not set
 CONFIG_DRIVERS_INTEL_WIFI=y
-CONFIG_DIMM_MAX=4
+# CONFIG_CHROMEOS is not set
+CONFIG_CONSOLE_SERIAL=y
+CONFIG_TPM_PIRQ=0x0
+CONFIG_PCIEXP_HOTPLUG_BUSES=32
+CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
+CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="QEMU x86 q35/ich9"
-CONFIG_MAINBOARD_VERSION="1.0"
-# CONFIG_DRIVERS_PS2_KEYBOARD is not set
+CONFIG_PS2K_EISAID="PNP0303"
+CONFIG_PS2M_EISAID="PNP0F13"
 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
@@ -145,7 +156,7 @@ CONFIG_COREBOOT_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=8192
-CONFIG_ROM_SIZE=0x800000
+CONFIG_ROM_SIZE=0x00800000
 CONFIG_HAVE_POWER_STATE_AFTER_FAILURE=y
 CONFIG_HAVE_POWER_STATE_PREVIOUS_AFTER_FAILURE=y
 CONFIG_POWER_STATE_OFF_AFTER_FAILURE=y
@@ -165,10 +176,11 @@ CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
 #
 # SoC
 #
-CONFIG_HAVE_BOOTBLOCK=y
 CONFIG_CPU_ADDR_BITS=36
+CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_EHCI_BAR=0xfef00000
-CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
+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
@@ -176,7 +188,6 @@ CONFIG_STACK_SIZE=0x1000
 # CONFIG_SOC_INTEL_GLK is not set
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
-CONFIG_VERSTAGE_ADDR=0x2000000
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_COMMON_CLOCK is not set
 # CONFIG_PCIEXP_CLK_PM is not set
@@ -228,7 +239,6 @@ CONFIG_SMM_ASEG=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_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
 # CONFIG_SOC_SETS_MSRS is not set
 CONFIG_SMP=y
 # CONFIG_SUPPORT_CPU_UCODE_IN_CBFS is not set
@@ -239,6 +249,8 @@ CONFIG_SMP=y
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
+CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
+CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
 
 #
 # Southbridge
@@ -278,9 +290,15 @@ CONFIG_SOUTHBRIDGE_INTEL_I82801IX=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_MAINBOARD_HAS_CHROMEOS=y
+
+#
+# ChromeOS
+#
 # CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
 # CONFIG_UDK_2015_BINDING is not set
@@ -296,7 +314,6 @@ CONFIG_ARCH_RAMSTAGE_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_X86_RESET_VECTOR=0xfffffff0
 # CONFIG_SIPI_VECTOR_IN_ROM is not set
 CONFIG_RAMBASE=0xe00000
 CONFIG_RAMTOP=0x1000000
@@ -304,7 +321,8 @@ 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 is not set
+CONFIG_HAVE_CMOS_DEFAULT=y
+CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
 CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS=y
 # CONFIG_HPET_ADDRESS_OVERRIDE is not set
 CONFIG_HPET_ADDRESS=0xfed00000
@@ -314,7 +332,6 @@ CONFIG_POSTCAR_STAGE=y
 # 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
 # CONFIG_PAGING_IN_CACHE_AS_RAM is not set
@@ -351,13 +368,16 @@ 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_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
 
 #
 # Generic Drivers
@@ -369,6 +389,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
 # 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_IN_CBFS is not set
 # CONFIG_SPI_FLASH is not set
@@ -396,8 +417,9 @@ 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_GFX_GENERIC 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
@@ -416,26 +438,32 @@ CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_YRES=768
 # CONFIG_INTEL_EDID is not set
 # CONFIG_INTEL_INT15 is not set
 # CONFIG_INTEL_GMA_ACPI is not set
+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_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_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_LPC_TPM is not set
-# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
+CONFIG_LPC_TPM=y
+CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
+CONFIG_MAINBOARD_HAS_LPC_TPM=y
 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_DRIVER_TI_TPS65090 is not set
-# CONFIG_DRIVERS_TI_TPS65913 is not set
 # CONFIG_DRIVERS_TI_TPS65913_RTC is not set
 # CONFIG_DRIVERS_USB_ACPI is not set
 # CONFIG_COMMONLIB_STORAGE is not set
@@ -452,15 +480,22 @@ CONFIG_VGA=y
 # Trusted Platform Module
 #
 CONFIG_USER_NO_TPM=y
+# CONFIG_USER_TPM1 is not set
+# CONFIG_USER_TPM2 is not set
+# CONFIG_TPM_RDRESP_NEED_DELAY is not set
 
 #
 # Memory initialization
 #
 CONFIG_PLATFORM_HAS_DRAM_CLEAR=y
 # CONFIG_SECURITY_CLEAR_DRAM_ON_REGULAR_BOOT is not set
-# CONFIG_ACPI_SATA_GENERATOR is not set
-CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
+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
@@ -473,7 +508,6 @@ CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
 CONFIG_BOOTBLOCK_CONSOLE=y
 CONFIG_POSTCAR_CONSOLE=y
 CONFIG_SQUELCH_EARLY_SMP=y
-CONFIG_CONSOLE_SERIAL=y
 
 #
 # I/O mapped, 8250-compatible
@@ -524,7 +558,6 @@ CONFIG_HAVE_OPTION_TABLE=y
 CONFIG_IOAPIC=y
 CONFIG_USE_WATCHDOG_ON_BOOT=y
 # CONFIG_GFXUMA is not set
-CONFIG_HAVE_ACPI_TABLES=y
 # CONFIG_COMMON_FADT is not set
 # CONFIG_ACPI_NHLT is not set
 
@@ -535,6 +568,7 @@ CONFIG_HAVE_ACPI_TABLES=y
 # 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"
 
 #
 # Payload
@@ -552,6 +586,7 @@ CONFIG_PAYLOAD_ELF=y
 CONFIG_PAYLOAD_FILE="$(FIRMWARE_OPEN_UEFIPAYLOAD)"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE 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
@@ -594,7 +629,6 @@ CONFIG_HAVE_DEBUG_SMBUS=y
 # CONFIG_DEBUG_BOOT_STATE is not set
 # CONFIG_DEBUG_ADA_CODE is not set
 # CONFIG_HAVE_EM100_SUPPORT is not set
-# CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
 # CONFIG_POWER_BUTTON_DEFAULT_DISABLE is not set
@@ -606,5 +640,6 @@ 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