Merge branch 'qemu' of and_who/libreboot into master

44 files changed, 218 insertions, 109 deletions

diff --git a/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/config b/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/config
new file mode 100644
index 00000000..1047c869
--- /dev/null
+++ b/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/config
@@ -0,0 +1,5 @@
+CONFIG_CBFS_SIZE=0x1000000
+CONFIG_COREBOOT_ROMSIZE_KB_8192=n
+CONFIG_COREBOOT_ROMSIZE_KB_16384=y
+CONFIG_COREBOOT_ROMSIZE_KB=16384
+CONFIG_ROM_SIZE=0x1000000
diff --git a/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/corebootfb/config b/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/corebootfb/config
new file mode 100644
index 00000000..cbd22dd6
--- /dev/null
+++ b/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/corebootfb/config
@@ -0,0 +1,5 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=n
+CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
+CONFIG_LINEAR_FRAMEBUFFER=y
+CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_XRES=800
+CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_YRES=600
diff --git a/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/corebootfb/grub/config b/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/corebootfb/grub/config
new file mode 100644
index 00000000..5170a90a
--- /dev/null
+++ b/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/corebootfb/grub/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/corebootfb/seabios/config b/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/corebootfb/seabios/config
new file mode 100644
index 00000000..a3c13aff
--- /dev/null
+++ b/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/corebootfb/seabios/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/corebootfb/targets b/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/corebootfb/targets
new file mode 100644
index 00000000..f2cba0e5
--- /dev/null
+++ b/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/corebootfb/targets
@@ -0,0 +1,2 @@
+grub
+seabios
diff --git a/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/targets b/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/targets
new file mode 100644
index 00000000..f84c583a
--- /dev/null
+++ b/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/targets
@@ -0,0 +1,2 @@
+corebootfb
+textmode
diff --git a/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/textmode/config b/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/textmode/config
new file mode 100644
index 00000000..5d8cce57
--- /dev/null
+++ b/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/textmode/config
@@ -0,0 +1 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/textmode/grub/config b/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/textmode/grub/config
new file mode 100644
index 00000000..5170a90a
--- /dev/null
+++ b/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/textmode/grub/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/textmode/seabios/config b/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/textmode/seabios/config
new file mode 100644
index 00000000..a3c13aff
--- /dev/null
+++ b/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/textmode/seabios/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/textmode/targets b/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/textmode/targets
new file mode 100644
index 00000000..f2cba0e5
--- /dev/null
+++ b/projects/coreboot/configs/qemu_i440fx_piix4/16MiB/textmode/targets
@@ -0,0 +1,2 @@
+grub
+seabios
diff --git a/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/config b/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/config
new file mode 100644
index 00000000..45291620
--- /dev/null
+++ b/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/config
@@ -0,0 +1,4 @@
+CONFIG_CBFS_SIZE=0x800000
+CONFIG_COREBOOT_ROMSIZE_KB_8192=y
+CONFIG_COREBOOT_ROMSIZE_KB=8192
+CONFIG_ROM_SIZE=0x800000
diff --git a/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/corebootfb/config b/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/corebootfb/config
new file mode 100644
index 00000000..cbd22dd6
--- /dev/null
+++ b/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/corebootfb/config
@@ -0,0 +1,5 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=n
+CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
+CONFIG_LINEAR_FRAMEBUFFER=y
+CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_XRES=800
+CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_YRES=600
diff --git a/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/corebootfb/grub/config b/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/corebootfb/grub/config
new file mode 100644
index 00000000..5170a90a
--- /dev/null
+++ b/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/corebootfb/grub/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/corebootfb/seabios/config b/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/corebootfb/seabios/config
new file mode 100644
index 00000000..a3c13aff
--- /dev/null
+++ b/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/corebootfb/seabios/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/corebootfb/targets b/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/corebootfb/targets
new file mode 100644
index 00000000..f2cba0e5
--- /dev/null
+++ b/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/corebootfb/targets
@@ -0,0 +1,2 @@
+grub
+seabios
diff --git a/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/targets b/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/targets
new file mode 100644
index 00000000..f84c583a
--- /dev/null
+++ b/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/targets
@@ -0,0 +1,2 @@
+corebootfb
+textmode
diff --git a/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/textmode/config b/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/textmode/config
new file mode 100644
index 00000000..5d8cce57
--- /dev/null
+++ b/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/textmode/config
@@ -0,0 +1 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/textmode/grub/config b/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/textmode/grub/config
new file mode 100644
index 00000000..5170a90a
--- /dev/null
+++ b/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/textmode/grub/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/textmode/seabios/config b/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/textmode/seabios/config
new file mode 100644
index 00000000..a3c13aff
--- /dev/null
+++ b/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/textmode/seabios/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/textmode/targets b/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/textmode/targets
new file mode 100644
index 00000000..f2cba0e5
--- /dev/null
+++ b/projects/coreboot/configs/qemu_i440fx_piix4/8MiB/textmode/targets
@@ -0,0 +1,2 @@
+grub
+seabios
diff --git a/projects/coreboot/configs/qemu_i440fx_piix4/config b/projects/coreboot/configs/qemu_i440fx_piix4/config
index 68d9efe7..48307887 100644
--- a/projects/coreboot/configs/qemu_i440fx_piix4/config
+++ b/projects/coreboot/configs/qemu_i440fx_piix4/config
@@ -23,7 +23,8 @@ CONFIG_INCLUDE_CONFIG_FILE=y
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
 # CONFIG_UBSAN is not set
-# CONFIG_RELOCATABLE_RAMSTAGE is not set
+# CONFIG_NO_RELOCATABLE_RAMSTAGE is not set
+CONFIG_RELOCATABLE_RAMSTAGE=y
 # CONFIG_UPDATE_IMAGE is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
 
@@ -34,34 +35,24 @@ CONFIG_INCLUDE_CONFIG_FILE=y
 #
 # Important: Run 'make distclean' before switching boards
 #
-# CONFIG_VENDOR_A_TREND is not set
-# CONFIG_VENDOR_AAEON is not set
-# CONFIG_VENDOR_ABIT is not set
 # 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_ARTECGROUP is not set
 # CONFIG_VENDOR_ASROCK is not set
 # CONFIG_VENDOR_ASUS is not set
 # CONFIG_VENDOR_AVALUE is not set
-# CONFIG_VENDOR_AZZA is not set
-# CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
-# CONFIG_VENDOR_BCOM is not set
 # CONFIG_VENDOR_BIOSTAR is not set
-# CONFIG_VENDOR_BROADCOM is not set
-# CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_CAVIUM is not set
 # CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
-# CONFIG_VENDOR_DIGITALLOGIC is not set
-# CONFIG_VENDOR_DMP is not set
-# CONFIG_VENDOR_ECS 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
 # CONFIG_VENDOR_GIGABYTE is not set
@@ -71,59 +62,45 @@ CONFIG_VENDOR_EMULATION=y
 # CONFIG_VENDOR_IBASE is not set
 # CONFIG_VENDOR_IEI is not set
 # CONFIG_VENDOR_INTEL is not set
-# CONFIG_VENDOR_IWAVE is not set
-# CONFIG_VENDOR_IWILL is not set
 # CONFIG_VENDOR_JETWAY is not set
 # CONFIG_VENDOR_KONTRON is not set
-# CONFIG_VENDOR_LANNER is not set
 # CONFIG_VENDOR_LENOVO is not set
-# CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
 # CONFIG_VENDOR_LOWRISC is not set
-# CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
-# CONFIG_VENDOR_NEC is not set
-# CONFIG_VENDOR_NOKIA is not set
-# CONFIG_VENDOR_NVIDIA 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_PURISM is not set
-# CONFIG_VENDOR_RCA 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_SOYO is not set
-# CONFIG_VENDOR_SUNW is not set
+# CONFIG_VENDOR_SIFIVE is not set
 # CONFIG_VENDOR_SUPERMICRO is not set
-# CONFIG_VENDOR_TECHNEXION is not set
-# CONFIG_VENDOR_THOMSON is not set
 # CONFIG_VENDOR_TI is not set
-# CONFIG_VENDOR_TRAVERSE is not set
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
-# CONFIG_VENDOR_WINENT is not set
-# CONFIG_VENDOR_WINNET is not set
-# CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="emulation/qemu-i440fx"
 CONFIG_MAINBOARD_PART_NUMBER="QEMU x86 i440fx/piix4"
-CONFIG_IRQ_SLOT_COUNT=6
-CONFIG_MAINBOARD_VENDOR="Emulation"
 CONFIG_MAX_CPUS=1
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
 CONFIG_CBFS_SIZE=0x800000
+CONFIG_MAINBOARD_VENDOR="Emulation"
+CONFIG_IRQ_SLOT_COUNT=6
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
-CONFIG_DCACHE_RAM_BASE=0xd0000
-CONFIG_DCACHE_RAM_SIZE=0x10000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Emulation"
-CONFIG_POST_IO=y
 CONFIG_DEVICETREE="devicetree.cb"
+CONFIG_POST_IO=y
+CONFIG_DCACHE_RAM_BASE=0xd0000
+CONFIG_DCACHE_RAM_SIZE=0x10000
 CONFIG_MAX_REBOOT_CNT=3
-CONFIG_ID_SECTION_OFFSET=0x80
+CONFIG_FMDFILE=""
 # CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
 CONFIG_BOARD_EMULATION_QEMU_X86_I440FX=y
 # CONFIG_BOARD_EMULATION_QEMU_POWER8 is not set
@@ -132,15 +109,16 @@ CONFIG_BOARD_EMULATION_QEMU_X86_I440FX=y
 # CONFIG_BOARD_EMULATION_SPIKE_UCB_RISCV is not set
 CONFIG_BOARD_EMULATION_QEMU_X86=y
 CONFIG_POST_DEVICE=y
-CONFIG_FMDFILE=""
-CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_OVERRIDE_DEVICETREE=""
+CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="QEMU x86 i440fx/piix4"
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_MAINBOARD_VERSION="1.0"
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_NO_POST is not set
+CONFIG_SMBIOS_ENCLOSURE_TYPE=0x03
 CONFIG_BOARD_ROMSIZE_KB_256=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
@@ -157,7 +135,6 @@ CONFIG_COREBOOT_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=8192
 CONFIG_ROM_SIZE=0x800000
-# CONFIG_MAINBOARD_HAS_TPM2 is not set
 # CONFIG_SYSTEM_TYPE_LAPTOP is not set
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
 
@@ -168,11 +145,13 @@ CONFIG_ROM_SIZE=0x800000
 #
 # SoC
 #
-CONFIG_RAMTOP=0x200000
 CONFIG_HEAP_SIZE=0x4000
-CONFIG_RAMBASE=0x100000
 CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+# 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_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -182,17 +161,20 @@ CONFIG_VERSTAGE_ADDR=0x2000000
 # CONFIG_PCIEXP_COMMON_CLOCK is not set
 # CONFIG_PCIEXP_CLK_PM is not set
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82371eb/bootblock.c"
-CONFIG_STACK_SIZE=0x1000
+# CONFIG_SOC_INTEL_COFFEELAKE is not set
+# CONFIG_CANNONLAKE_SOC_PCH_H is not set
+CONFIG_RAMTOP=0x200000
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_UART_PCI_ADDR=0x0
 # CONFIG_SOC_INTEL_KABYLAKE is not set
 # CONFIG_SOC_LOWRISC_LOWRISC is not set
-# CONFIG_SOC_MARVELL_MVMAP2315 is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
+# CONFIG_SOC_MEDIATEK_MT8183 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
+# CONFIG_SOC_QUALCOMM_SDM845 is not set
 # CONFIG_SOC_ROCKCHIP_RK3288 is not set
 # CONFIG_SOC_ROCKCHIP_RK3399 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
@@ -244,12 +226,7 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 # Northbridge
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-CONFIG_NO_MMCONF_SUPPORT=y
-# CONFIG_AMD_NB_CIMX is not set
-# CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-# CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
-CONFIG_HPET_ADDRESS=0xfed00000
 CONFIG_MAX_PIRQ_LINKS=4
 
 #
@@ -265,6 +242,7 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON_PIRQ_ACPI_GEN is not set
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
 # CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
+# CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMM is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82371EB=y
 
 #
@@ -275,10 +253,16 @@ CONFIG_SOUTHBRIDGE_INTEL_I82371EB=y
 #
 # Embedded Controllers
 #
+# 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_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_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -309,6 +293,7 @@ CONFIG_SOUTHBRIDGE_INTEL_I82371EB=y
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
+# CONFIG_ARM64_USE_ARCH_TIMER is not set
 # CONFIG_ARM64_A53_ERRATUM_843419 is not set
 # CONFIG_ARCH_MIPS is not set
 # CONFIG_ARCH_BOOTBLOCK_MIPS is not set
@@ -337,7 +322,7 @@ 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_ROMCC is not set
+CONFIG_RAMBASE=0x100000
 # CONFIG_CBMEM_TOP_BACKUP is not set
 # CONFIG_LATE_CBMEM_INIT is not set
 # CONFIG_EARLY_EBDA_INIT is not set
@@ -348,12 +333,17 @@ 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_ID_SECTION_OFFSET=0x80
 # CONFIG_POSTCAR_STAGE is not set
 # 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_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_PAGING_IN_CACHE_AS_RAM is not set
+# CONFIG_IDT_IN_EVERY_STAGE is not set
 
 #
 # Devices
@@ -373,6 +363,7 @@ CONFIG_VGA_TEXT_FRAMEBUFFER=y
 # CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
 # CONFIG_SMBUS_HAS_AUX_CHANNELS is not set
 CONFIG_PCI=y
+CONFIG_NO_MMCONF_SUPPORT=y
 # CONFIG_MMCONF_SUPPORT is not set
 # CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT is not set
 CONFIG_PCIX_PLUGIN_SUPPORT=y
@@ -411,18 +402,24 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS=y
 # CONFIG_SMBIOS_PROVIDED_BY_MOBO 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_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_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_FSP2_0 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 is not set
 # 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_MIPI_CAMERA is not set
 # CONFIG_DRIVERS_INTEL_WIFI is not set
@@ -432,6 +429,7 @@ CONFIG_DRIVERS_EMULATION_QEMU_BOCHS=y
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
+# CONFIG_LPC_TPM is not set
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
@@ -442,6 +440,7 @@ CONFIG_VGA=y
 # 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_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_COMMONLIB_STORAGE is not set
 
@@ -452,6 +451,11 @@ CONFIG_VGA=y
 #
 # Verified Boot (vboot)
 #
+
+#
+# Trusted Platform Module
+#
+CONFIG_USER_NO_TPM=y
 # CONFIG_ACPI_SATA_GENERATOR is not set
 # CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
 # CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
@@ -460,8 +464,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH=y
 CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
 # CONFIG_BOOT_DEVICE_SUPPORTS_WRITES is not set
 # CONFIG_RTC is not set
-# CONFIG_TPM is not set
-# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
 # Console
@@ -523,9 +525,11 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_FIT is not set
 # CONFIG_PAYLOAD_BAYOU 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_LINUX is not set
@@ -534,7 +538,10 @@ CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
+# CONFIG_COMPRESSED_PAYLOAD_LZ4 is not set
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
+# CONFIG_PAYLOAD_FIT_SUPPORT is not set
+CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
 
 #
 # Secondary Payloads
@@ -559,6 +566,7 @@ CONFIG_HAVE_DEBUG_SMBUS=y
 # 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_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
@@ -572,4 +580,6 @@ CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_NO_XIP_EARLY_STAGES is not set
 CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_EARLY_CBMEM_LIST is not set
+CONFIG_RELOCATABLE_MODULES=y
+CONFIG_NO_STAGE_CACHE=y
 CONFIG_BOOTBLOCK_CUSTOM=y
diff --git a/projects/coreboot/configs/qemu_i440fx_piix4/targets b/projects/coreboot/configs/qemu_i440fx_piix4/targets
new file mode 100644
index 00000000..809616a8
--- /dev/null
+++ b/projects/coreboot/configs/qemu_i440fx_piix4/targets
@@ -0,0 +1,2 @@
+16MiB
+8MiB
diff --git a/projects/coreboot/configs/qemu_q35_ich9/16MiB/config b/projects/coreboot/configs/qemu_q35_ich9/16MiB/config
new file mode 100644
index 00000000..1047c869
--- /dev/null
+++ b/projects/coreboot/configs/qemu_q35_ich9/16MiB/config
@@ -0,0 +1,5 @@
+CONFIG_CBFS_SIZE=0x1000000
+CONFIG_COREBOOT_ROMSIZE_KB_8192=n
+CONFIG_COREBOOT_ROMSIZE_KB_16384=y
+CONFIG_COREBOOT_ROMSIZE_KB=16384
+CONFIG_ROM_SIZE=0x1000000
diff --git a/projects/coreboot/configs/qemu_q35_ich9/16MiB/corebootfb/config b/projects/coreboot/configs/qemu_q35_ich9/16MiB/corebootfb/config
new file mode 100644
index 00000000..cbd22dd6
--- /dev/null
+++ b/projects/coreboot/configs/qemu_q35_ich9/16MiB/corebootfb/config
@@ -0,0 +1,5 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=n
+CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
+CONFIG_LINEAR_FRAMEBUFFER=y
+CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_XRES=800
+CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_YRES=600
diff --git a/projects/coreboot/configs/qemu_q35_ich9/16MiB/corebootfb/grub/config b/projects/coreboot/configs/qemu_q35_ich9/16MiB/corebootfb/grub/config
new file mode 100644
index 00000000..5170a90a
--- /dev/null
+++ b/projects/coreboot/configs/qemu_q35_ich9/16MiB/corebootfb/grub/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/qemu_q35_ich9/16MiB/corebootfb/seabios/config b/projects/coreboot/configs/qemu_q35_ich9/16MiB/corebootfb/seabios/config
new file mode 100644
index 00000000..a3c13aff
--- /dev/null
+++ b/projects/coreboot/configs/qemu_q35_ich9/16MiB/corebootfb/seabios/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/qemu_q35_ich9/16MiB/corebootfb/targets b/projects/coreboot/configs/qemu_q35_ich9/16MiB/corebootfb/targets
new file mode 100644
index 00000000..f2cba0e5
--- /dev/null
+++ b/projects/coreboot/configs/qemu_q35_ich9/16MiB/corebootfb/targets
@@ -0,0 +1,2 @@
+grub
+seabios
diff --git a/projects/coreboot/configs/qemu_q35_ich9/16MiB/targets b/projects/coreboot/configs/qemu_q35_ich9/16MiB/targets
new file mode 100644
index 00000000..f84c583a
--- /dev/null
+++ b/projects/coreboot/configs/qemu_q35_ich9/16MiB/targets
@@ -0,0 +1,2 @@
+corebootfb
+textmode
diff --git a/projects/coreboot/configs/qemu_q35_ich9/16MiB/textmode/config b/projects/coreboot/configs/qemu_q35_ich9/16MiB/textmode/config
new file mode 100644
index 00000000..5d8cce57
--- /dev/null
+++ b/projects/coreboot/configs/qemu_q35_ich9/16MiB/textmode/config
@@ -0,0 +1 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/qemu_q35_ich9/16MiB/textmode/grub/config b/projects/coreboot/configs/qemu_q35_ich9/16MiB/textmode/grub/config
new file mode 100644
index 00000000..5170a90a
--- /dev/null
+++ b/projects/coreboot/configs/qemu_q35_ich9/16MiB/textmode/grub/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/qemu_q35_ich9/16MiB/textmode/seabios/config b/projects/coreboot/configs/qemu_q35_ich9/16MiB/textmode/seabios/config
new file mode 100644
index 00000000..a3c13aff
--- /dev/null
+++ b/projects/coreboot/configs/qemu_q35_ich9/16MiB/textmode/seabios/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/qemu_q35_ich9/16MiB/textmode/targets b/projects/coreboot/configs/qemu_q35_ich9/16MiB/textmode/targets
new file mode 100644
index 00000000..f2cba0e5
--- /dev/null
+++ b/projects/coreboot/configs/qemu_q35_ich9/16MiB/textmode/targets
@@ -0,0 +1,2 @@
+grub
+seabios
diff --git a/projects/coreboot/configs/qemu_q35_ich9/8MiB/config b/projects/coreboot/configs/qemu_q35_ich9/8MiB/config
new file mode 100644
index 00000000..45291620
--- /dev/null
+++ b/projects/coreboot/configs/qemu_q35_ich9/8MiB/config
@@ -0,0 +1,4 @@
+CONFIG_CBFS_SIZE=0x800000
+CONFIG_COREBOOT_ROMSIZE_KB_8192=y
+CONFIG_COREBOOT_ROMSIZE_KB=8192
+CONFIG_ROM_SIZE=0x800000
diff --git a/projects/coreboot/configs/qemu_q35_ich9/8MiB/corebootfb/config b/projects/coreboot/configs/qemu_q35_ich9/8MiB/corebootfb/config
new file mode 100644
index 00000000..cbd22dd6
--- /dev/null
+++ b/projects/coreboot/configs/qemu_q35_ich9/8MiB/corebootfb/config
@@ -0,0 +1,5 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=n
+CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
+CONFIG_LINEAR_FRAMEBUFFER=y
+CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_XRES=800
+CONFIG_DRIVERS_EMULATION_QEMU_BOCHS_YRES=600
diff --git a/projects/coreboot/configs/qemu_q35_ich9/8MiB/corebootfb/grub/config b/projects/coreboot/configs/qemu_q35_ich9/8MiB/corebootfb/grub/config
new file mode 100644
index 00000000..5170a90a
--- /dev/null
+++ b/projects/coreboot/configs/qemu_q35_ich9/8MiB/corebootfb/grub/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/qemu_q35_ich9/8MiB/corebootfb/seabios/config b/projects/coreboot/configs/qemu_q35_ich9/8MiB/corebootfb/seabios/config
new file mode 100644
index 00000000..a3c13aff
--- /dev/null
+++ b/projects/coreboot/configs/qemu_q35_ich9/8MiB/corebootfb/seabios/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/qemu_q35_ich9/8MiB/corebootfb/targets b/projects/coreboot/configs/qemu_q35_ich9/8MiB/corebootfb/targets
new file mode 100644
index 00000000..f2cba0e5
--- /dev/null
+++ b/projects/coreboot/configs/qemu_q35_ich9/8MiB/corebootfb/targets
@@ -0,0 +1,2 @@
+grub
+seabios
diff --git a/projects/coreboot/configs/qemu_q35_ich9/8MiB/targets b/projects/coreboot/configs/qemu_q35_ich9/8MiB/targets
new file mode 100644
index 00000000..f84c583a
--- /dev/null
+++ b/projects/coreboot/configs/qemu_q35_ich9/8MiB/targets
@@ -0,0 +1,2 @@
+corebootfb
+textmode
diff --git a/projects/coreboot/configs/qemu_q35_ich9/8MiB/textmode/config b/projects/coreboot/configs/qemu_q35_ich9/8MiB/textmode/config
new file mode 100644
index 00000000..5d8cce57
--- /dev/null
+++ b/projects/coreboot/configs/qemu_q35_ich9/8MiB/textmode/config
@@ -0,0 +1 @@
+CONFIG_VGA_TEXT_FRAMEBUFFER=y
diff --git a/projects/coreboot/configs/qemu_q35_ich9/8MiB/textmode/grub/config b/projects/coreboot/configs/qemu_q35_ich9/8MiB/textmode/grub/config
new file mode 100644
index 00000000..5170a90a
--- /dev/null
+++ b/projects/coreboot/configs/qemu_q35_ich9/8MiB/textmode/grub/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../grub-coreboot/grub2"
diff --git a/projects/coreboot/configs/qemu_q35_ich9/8MiB/textmode/seabios/config b/projects/coreboot/configs/qemu_q35_ich9/8MiB/textmode/seabios/config
new file mode 100644
index 00000000..a3c13aff
--- /dev/null
+++ b/projects/coreboot/configs/qemu_q35_ich9/8MiB/textmode/seabios/config
@@ -0,0 +1 @@
+CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
diff --git a/projects/coreboot/configs/qemu_q35_ich9/8MiB/textmode/targets b/projects/coreboot/configs/qemu_q35_ich9/8MiB/textmode/targets
new file mode 100644
index 00000000..f2cba0e5
--- /dev/null
+++ b/projects/coreboot/configs/qemu_q35_ich9/8MiB/textmode/targets
@@ -0,0 +1,2 @@
+grub
+seabios
diff --git a/projects/coreboot/configs/qemu_q35_ich9/config b/projects/coreboot/configs/qemu_q35_ich9/config
index f7f05e75..925765b8 100644
--- a/projects/coreboot/configs/qemu_q35_ich9/config
+++ b/projects/coreboot/configs/qemu_q35_ich9/config
@@ -15,13 +15,16 @@ CONFIG_COMPILER_GCC=y
 # 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 is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
 # CONFIG_UBSAN is not set
-# CONFIG_RELOCATABLE_RAMSTAGE is not set
+# CONFIG_NO_RELOCATABLE_RAMSTAGE is not set
+CONFIG_RELOCATABLE_RAMSTAGE=y
 # CONFIG_UPDATE_IMAGE is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
 
@@ -32,34 +35,24 @@ CONFIG_INCLUDE_CONFIG_FILE=y
 #
 # Important: Run 'make distclean' before switching boards
 #
-# CONFIG_VENDOR_A_TREND is not set
-# CONFIG_VENDOR_AAEON is not set
-# CONFIG_VENDOR_ABIT is not set
 # 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_ARTECGROUP is not set
 # CONFIG_VENDOR_ASROCK is not set
 # CONFIG_VENDOR_ASUS is not set
 # CONFIG_VENDOR_AVALUE is not set
-# CONFIG_VENDOR_AZZA is not set
-# CONFIG_VENDOR_BACHMANN is not set
 # CONFIG_VENDOR_BAP is not set
-# CONFIG_VENDOR_BCOM is not set
 # CONFIG_VENDOR_BIOSTAR is not set
-# CONFIG_VENDOR_BROADCOM is not set
-# CONFIG_VENDOR_COMPAQ is not set
+# CONFIG_VENDOR_CAVIUM is not set
 # CONFIG_VENDOR_COMPULAB is not set
 # CONFIG_VENDOR_CUBIETECH is not set
-# CONFIG_VENDOR_DIGITALLOGIC is not set
-# CONFIG_VENDOR_DMP is not set
-# CONFIG_VENDOR_ECS 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
 # CONFIG_VENDOR_GIGABYTE is not set
@@ -69,60 +62,45 @@ CONFIG_VENDOR_EMULATION=y
 # CONFIG_VENDOR_IBASE is not set
 # CONFIG_VENDOR_IEI is not set
 # CONFIG_VENDOR_INTEL is not set
-# CONFIG_VENDOR_IWAVE is not set
-# CONFIG_VENDOR_IWILL is not set
 # CONFIG_VENDOR_JETWAY is not set
 # CONFIG_VENDOR_KONTRON is not set
-# CONFIG_VENDOR_LANNER is not set
 # CONFIG_VENDOR_LENOVO is not set
-# CONFIG_VENDOR_LINUTOP is not set
 # CONFIG_VENDOR_LIPPERT is not set
 # CONFIG_VENDOR_LOWRISC is not set
-# CONFIG_VENDOR_MITAC is not set
 # CONFIG_VENDOR_MSI is not set
-# CONFIG_VENDOR_NEC is not set
-# CONFIG_VENDOR_NOKIA is not set
-# CONFIG_VENDOR_NVIDIA 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_PURISM is not set
-# CONFIG_VENDOR_RCA 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_SOYO is not set
-# CONFIG_VENDOR_SUNW is not set
+# CONFIG_VENDOR_SIFIVE is not set
 # CONFIG_VENDOR_SUPERMICRO is not set
-# CONFIG_VENDOR_TECHNEXION is not set
-# CONFIG_VENDOR_THOMSON is not set
 # CONFIG_VENDOR_TI is not set
-# CONFIG_VENDOR_TRAVERSE is not set
 # CONFIG_VENDOR_TYAN is not set
 # CONFIG_VENDOR_VIA is not set
-# CONFIG_VENDOR_WINENT is not set
-# CONFIG_VENDOR_WINNET is not set
-# CONFIG_VENDOR_WYSE is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="emulation/qemu-q35"
 CONFIG_MAINBOARD_PART_NUMBER="QEMU x86 q35/ich9"
-CONFIG_MAINBOARD_VENDOR="Emulation"
 CONFIG_MAX_CPUS=1
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0
 CONFIG_CBFS_SIZE=0x800000
+CONFIG_MAINBOARD_VENDOR="Emulation"
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 CONFIG_DIMM_SPD_SIZE=256
 # CONFIG_VGA_BIOS is not set
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
-CONFIG_DCACHE_RAM_BASE=0xd0000
-CONFIG_DCACHE_RAM_SIZE=0x10000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Emulation"
-CONFIG_MMCONF_BASE_ADDRESS=0xb0000000
-CONFIG_POST_IO=y
 CONFIG_DEVICETREE="devicetree.cb"
+CONFIG_POST_IO=y
 CONFIG_BOOTBLOCK_MAINBOARD_INIT="mainboard/emulation/qemu-q35/bootblock.c"
+CONFIG_DCACHE_RAM_BASE=0xd0000
+CONFIG_DCACHE_RAM_SIZE=0x10000
 CONFIG_MAX_REBOOT_CNT=3
-CONFIG_ID_SECTION_OFFSET=0x80
+CONFIG_FMDFILE=""
 # 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
@@ -130,11 +108,12 @@ CONFIG_BOARD_EMULATION_QEMU_X86_Q35=y
 # CONFIG_BOARD_EMULATION_QEMU_UCB_RISCV is not set
 # CONFIG_BOARD_EMULATION_SPIKE_UCB_RISCV is not set
 CONFIG_BOARD_EMULATION_QEMU_X86=y
+CONFIG_MMCONF_BASE_ADDRESS=0xb0000000
 CONFIG_POST_DEVICE=y
+CONFIG_DRIVERS_UART_8250IO=y
 # CONFIG_VBOOT is not set
-CONFIG_FMDFILE=""
+CONFIG_OVERRIDE_DEVICETREE=""
 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
-CONFIG_DRIVERS_UART_8250IO=y
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="QEMU x86 q35/ich9"
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
@@ -143,6 +122,7 @@ CONFIG_MAINBOARD_VERSION="1.0"
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
 # CONFIG_PCIEXP_L1_SUB_STATE is not set
 # CONFIG_NO_POST is not set
+CONFIG_SMBIOS_ENCLOSURE_TYPE=0x03
 CONFIG_BOARD_ROMSIZE_KB_2048=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
@@ -159,7 +139,6 @@ CONFIG_COREBOOT_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=8192
 CONFIG_ROM_SIZE=0x800000
-# CONFIG_MAINBOARD_HAS_TPM2 is not set
 # CONFIG_SYSTEM_TYPE_LAPTOP is not set
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
 
@@ -170,12 +149,14 @@ CONFIG_ROM_SIZE=0x800000
 #
 # SoC
 #
-CONFIG_RAMTOP=0x200000
 CONFIG_HEAP_SIZE=0x4000
-CONFIG_RAMBASE=0x100000
 CONFIG_EHCI_BAR=0xfef00000
 CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 # CONFIG_SOC_BROADCOM_CYGNUS is not set
+# 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_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
@@ -185,18 +166,20 @@ CONFIG_VERSTAGE_ADDR=0x2000000
 # CONFIG_PCIEXP_COMMON_CLOCK is not set
 # CONFIG_PCIEXP_CLK_PM is not set
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
-CONFIG_STACK_SIZE=0x1000
+# CONFIG_SOC_INTEL_COFFEELAKE is not set
+# CONFIG_CANNONLAKE_SOC_PCH_H is not set
+CONFIG_RAMTOP=0x200000
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_UART_PCI_ADDR=0x0
-CONFIG_HPET_MIN_TICKS=0x80
 # CONFIG_SOC_INTEL_KABYLAKE is not set
 # CONFIG_SOC_LOWRISC_LOWRISC is not set
-# CONFIG_SOC_MARVELL_MVMAP2315 is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
+# CONFIG_SOC_MEDIATEK_MT8183 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
+# CONFIG_SOC_QUALCOMM_SDM845 is not set
 # CONFIG_SOC_ROCKCHIP_RK3288 is not set
 # CONFIG_SOC_ROCKCHIP_RK3399 is not set
 # CONFIG_CPU_SAMSUNG_EXYNOS5250 is not set
@@ -248,12 +231,7 @@ CONFIG_CPU_MICROCODE_CBFS_NONE=y
 # Northbridge
 #
 # CONFIG_NORTHBRIDGE_AMD_AGESA is not set
-# CONFIG_NO_MMCONF_SUPPORT is not set
-# CONFIG_AMD_NB_CIMX is not set
-# CONFIG_NORTHBRIDGE_AMD_CIMX_RD890 is not set
 # CONFIG_NORTHBRIDGE_AMD_PI is not set
-# CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
-CONFIG_HPET_ADDRESS=0xfed00000
 CONFIG_MAX_PIRQ_LINKS=4
 
 #
@@ -262,13 +240,15 @@ CONFIG_MAX_PIRQ_LINKS=4
 # CONFIG_AMD_SB_CIMX is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
+CONFIG_HPET_MIN_TICKS=0x80
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=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_PIRQ_ACPI_GEN is not set
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ 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_I82801IX=y
 
 #
@@ -279,10 +259,16 @@ CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 #
 # Embedded Controllers
 #
+# 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_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_ARCH_ARM is not set
 # CONFIG_ARCH_BOOTBLOCK_ARM is not set
@@ -313,6 +299,7 @@ CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 # CONFIG_ARCH_VERSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_ROMSTAGE_ARMV8_64 is not set
 # CONFIG_ARCH_RAMSTAGE_ARMV8_64 is not set
+# CONFIG_ARM64_USE_ARCH_TIMER is not set
 # CONFIG_ARM64_A53_ERRATUM_843419 is not set
 # CONFIG_ARCH_MIPS is not set
 # CONFIG_ARCH_BOOTBLOCK_MIPS is not set
@@ -341,20 +328,26 @@ 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_ROMCC is not set
+CONFIG_RAMBASE=0x100000
 # CONFIG_CBMEM_TOP_BACKUP is not set
 # CONFIG_LATE_CBMEM_INIT is not set
 # CONFIG_EARLY_EBDA_INIT is not set
 CONFIG_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
 # CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
+# CONFIG_HAVE_CMOS_DEFAULT is not set
 CONFIG_IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS=y
+# CONFIG_HPET_ADDRESS_OVERRIDE is not set
+CONFIG_HPET_ADDRESS=0xfed00000
+CONFIG_ID_SECTION_OFFSET=0x80
 # CONFIG_POSTCAR_STAGE is not set
 # 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_BOOTBLOCK_SOURCE="bootblock_simple.c"
+# CONFIG_PAGING_IN_CACHE_AS_RAM is not set
+# CONFIG_IDT_IN_EVERY_STAGE is not set
 
 #
 # Devices
@@ -374,6 +367,7 @@ CONFIG_VGA_TEXT_FRAMEBUFFER=y
 # CONFIG_GENERIC_LINEAR_FRAMEBUFFER 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_PCIX_PLUGIN_SUPPORT=y
@@ -412,18 +406,24 @@ CONFIG_HAVE_USBDEBUG_OPTIONS=y
 # CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS=y
 # CONFIG_SMBIOS_PROVIDED_BY_MOBO 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_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_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_FSP2_0 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 is not set
 # 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_MIPI_CAMERA is not set
 # CONFIG_DRIVERS_INTEL_WIFI is not set
@@ -433,6 +433,7 @@ CONFIG_DRIVERS_EMULATION_QEMU_BOCHS=y
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
+# CONFIG_LPC_TPM is not set
 # CONFIG_MAINBOARD_HAS_LPC_TPM is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
@@ -443,6 +444,7 @@ CONFIG_VGA=y
 # 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_DRIVER_XPOWERS_AXP209 is not set
 # CONFIG_COMMONLIB_STORAGE is not set
 
@@ -453,16 +455,19 @@ CONFIG_VGA=y
 #
 # Verified Boot (vboot)
 #
+
+#
+# Trusted Platform Module
+#
+CONFIG_USER_NO_TPM=y
 # CONFIG_ACPI_SATA_GENERATOR is not set
-# CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
+CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES=y
 # CONFIG_ACPI_AMD_HARDWARE_SLEEP_VALUES is not set
 # 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 is not set
 # CONFIG_RTC is not set
-# CONFIG_TPM is not set
-# CONFIG_MAINBOARD_HAS_TPM_CR50 is not set
 
 #
 # Console
@@ -500,7 +505,7 @@ CONFIG_HAVE_HARD_RESET=y
 # CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK is not set
 # CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK is not set
 # CONFIG_HAVE_MONOTONIC_TIMER is not set
-# CONFIG_HAVE_OPTION_TABLE is not set
+CONFIG_HAVE_OPTION_TABLE=y
 # CONFIG_PIRQ_ROUTE is not set
 CONFIG_HAVE_SMI_HANDLER=y
 # CONFIG_PCI_IO_CFG_EXT is not set
@@ -523,9 +528,11 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 #
 # CONFIG_PAYLOAD_NONE is not set
 CONFIG_PAYLOAD_ELF=y
+# CONFIG_PAYLOAD_FIT is not set
 # CONFIG_PAYLOAD_BAYOU 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_LINUX is not set
@@ -534,7 +541,10 @@ CONFIG_PAYLOAD_FILE="$(obj)/../seabios/bios.bin.elf"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
+# CONFIG_COMPRESSED_PAYLOAD_LZ4 is not set
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
+# CONFIG_PAYLOAD_FIT_SUPPORT is not set
+CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
 
 #
 # Secondary Payloads
@@ -560,6 +570,7 @@ CONFIG_HAVE_DEBUG_SMBUS=y
 # 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_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
@@ -573,4 +584,6 @@ CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_NO_XIP_EARLY_STAGES is not set
 CONFIG_EARLY_CBMEM_INIT=y
 # CONFIG_EARLY_CBMEM_LIST is not set
+CONFIG_RELOCATABLE_MODULES=y
+CONFIG_NO_STAGE_CACHE=y
 CONFIG_BOOTBLOCK_CUSTOM=y
diff --git a/projects/coreboot/configs/qemu_q35_ich9/targets b/projects/coreboot/configs/qemu_q35_ich9/targets
new file mode 100644
index 00000000..809616a8
--- /dev/null
+++ b/projects/coreboot/configs/qemu_q35_ich9/targets
@@ -0,0 +1,2 @@
+16MiB
+8MiB