diff --git a/config/coreboot-qemu.config b/config/coreboot-qemu.config
index ed2dfbf..60d3e29 100644
--- a/config/coreboot-qemu.config
+++ b/config/coreboot-qemu.config
@@ -6,7 +6,7 @@
 #
 # General setup
 #
-CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION="-heads"
 CONFIG_CBFS_PREFIX="fallback"
 # CONFIG_MULTIPLE_CBFS_INSTANCES is not set
 CONFIG_COMPILER_GCC=y
@@ -18,13 +18,15 @@ CONFIG_COMPILER_GCC=y
 # CONFIG_UNCOMPRESSED_RAMSTAGE is not set
 CONFIG_COMPRESS_RAMSTAGE=y
 # CONFIG_INCLUDE_CONFIG_FILE is not set
+# CONFIG_NO_XIP_EARLY_STAGES is not set
 CONFIG_EARLY_CBMEM_INIT=y
+# CONFIG_EARLY_CBMEM_LIST is not set
 # CONFIG_COLLECT_TIMESTAMPS is not set
 # CONFIG_USE_BLOBS is not set
 # CONFIG_COVERAGE is not set
 # CONFIG_RELOCATABLE_MODULES is not set
 # CONFIG_RELOCATABLE_RAMSTAGE is not set
-CONFIG_FLASHMAP_OFFSET=0x00610000
+# CONFIG_NO_STAGE_CACHE is not set
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_CUSTOM=y
@@ -34,9 +36,9 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # CONFIG_GENERIC_GPIO_LIB is not set
 # CONFIG_BOARD_ID_AUTO is not set
 # CONFIG_BOARD_ID_MANUAL is not set
+CONFIG_DEVICETREE="devicetree.cb"
 # CONFIG_RAM_CODE_SUPPORT is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
-# CONFIG_ACPI_SATA_GENERATOR is not set
 
 #
 # Mainboard
@@ -44,6 +46,7 @@ CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
 # 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
@@ -111,6 +114,9 @@ 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=0
+CONFIG_CBFS_SIZE=0x400000
+CONFIG_UART_FOR_CONSOLE=0
 # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set
 # CONFIG_VGA_BIOS is not set
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
@@ -122,7 +128,6 @@ CONFIG_POST_IO=y
 CONFIG_BOOTBLOCK_MAINBOARD_INIT="mainboard/emulation/qemu-q35/bootblock.c"
 CONFIG_MAX_REBOOT_CNT=3
 CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
-CONFIG_UART_FOR_CONSOLE=0
 CONFIG_ID_SECTION_OFFSET=0x80
 # CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
 # CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
@@ -131,19 +136,15 @@ 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_RAMTOP=0x200000
-CONFIG_CACHE_ROM_SIZE_OVERRIDE=0
-CONFIG_CBFS_SIZE=0x400000
 # CONFIG_POST_DEVICE is not set
-CONFIG_TPM_PIRQ=0
+CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_TTYS0_LCS=3
 # CONFIG_CONSOLE_POST is not set
 CONFIG_DRIVERS_UART_8250IO=y
 CONFIG_CPU_ADDR_BITS=36
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7
+CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
 CONFIG_MAINBOARD_VERSION="1.0"
-CONFIG_DRIVERS_PS2_KEYBOARD=y
 # CONFIG_NO_POST is not set
 CONFIG_BOARD_ROMSIZE_KB_256=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
@@ -156,9 +157,12 @@ CONFIG_BOARD_ROMSIZE_KB_256=y
 # CONFIG_COREBOOT_ROMSIZE_KB_8192 is not set
 CONFIG_COREBOOT_ROMSIZE_KB_12288=y
 # CONFIG_COREBOOT_ROMSIZE_KB_16384 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_32768 is not set
+# CONFIG_COREBOOT_ROMSIZE_KB_65536 is not set
 CONFIG_COREBOOT_ROMSIZE_KB=12288
 CONFIG_ROM_SIZE=0xc00000
 CONFIG_FMDFILE=""
+# CONFIG_MAINBOARD_HAS_TPM2 is not set
 # CONFIG_SYSTEM_TYPE_LAPTOP is not set
 # CONFIG_CBFS_AUTOGEN_ATTRIBUTES is not set
 
@@ -173,17 +177,21 @@ CONFIG_FMDFILE=""
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0x10000
 CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
+CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
 CONFIG_TTYS0_BASE=0x3f8
 CONFIG_EHCI_BAR=0xfef00000
+CONFIG_RAMTOP=0x200000
 CONFIG_HEAP_SIZE=0x4000
 CONFIG_CONSOLE_CBMEM=y
+CONFIG_UART_PCI_ADDR=0
+CONFIG_HPET_MIN_TICKS=0x80
 # CONFIG_SOC_MARVELL_ARMADA38X is not set
 # CONFIG_SOC_MARVELL_BG4CD is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
-# CONFIG_SOC_NVIDIA_TEGRA132 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_ROCKCHIP_RK3288 is not set
 # CONFIG_SOC_ROCKCHIP_RK3399 is not set
@@ -213,14 +221,15 @@ CONFIG_UDELAY_IO=y
 # CONFIG_UDELAY_TIMER2 is not set
 # CONFIG_TSC_SYNC_LFENCE is not set
 # CONFIG_TSC_SYNC_MFENCE is not set
+# CONFIG_NO_FIXED_XIP_ROM_SIZE is not set
 CONFIG_LOGICAL_CPUS=y
 # CONFIG_SMM_TSEG is not set
 # CONFIG_SMM_LAPIC_REMAP_MITIGATION is not set
 # CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
 # CONFIG_PLATFORM_USES_FSP1_0 is not set
-# CONFIG_BACKUP_DEFAULT_SMM_REGION is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
+# CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
 CONFIG_SMP=y
 CONFIG_AP_SIPI_VECTOR=0xfffff000
@@ -242,7 +251,6 @@ CONFIG_VIDEO_MB=0
 CONFIG_RAMBASE=0x100000
 # CONFIG_NORTHBRIDGE_INTEL_COMMON_MRC_CACHE is not set
 CONFIG_HPET_ADDRESS=0xfed00000
-CONFIG_HPET_MIN_TICKS=0x80
 CONFIG_MAX_PIRQ_LINKS=4
 
 #
@@ -252,7 +260,7 @@ CONFIG_MAX_PIRQ_LINKS=4
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB800 is not set
 # CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 is not set
 CONFIG_SOUTHBRIDGE_INTEL_COMMON=y
-# CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO is not set
+CONFIG_SOUTHBRIDGE_INTEL_COMMON_GPIO=y
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 
 #
@@ -262,6 +270,11 @@ CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 #
 # Embedded Controllers
 #
+CONFIG_VBOOT_VBNV_OFFSET=0x26
+# CONFIG_VBOOT_VBNV_CMOS is not set
+# CONFIG_VBOOT_VBNV_EC is not set
+# CONFIG_VBOOT_VBNV_FLASH is not set
+# CONFIG_VBOOT is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 # CONFIG_UEFI_2_4_BINDING is not set
 # CONFIG_USE_SIEMENS_HWILIB is not set
@@ -321,10 +334,13 @@ CONFIG_ARCH_RAMSTAGE_X86_32=y
 # CONFIG_ROMCC is not set
 # CONFIG_LATE_CBMEM_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_VERSTAGE_ADDR=0x2000000
 # CONFIG_POSTCAR_STAGE is not set
+# CONFIG_VERSTAGE_DEBUG_SPINLOOP is not set
+# CONFIG_ROMSTAGE_DEBUG_SPINLOOP is not set
 
 #
 # Devices
@@ -363,20 +379,25 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
+# CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set
+# CONFIG_REALTEK_8168_RESET is not set
 # CONFIG_SPI_FLASH is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
 CONFIG_DRIVERS_UART=y
 # 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_DRIVER_XPOWERS_AXP209 is not set
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS=y
 # CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
+# CONFIG_DRIVERS_I2C_PCF8523 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 # CONFIG_INTEL_DP is not set
 # CONFIG_INTEL_DDI is not set
@@ -384,27 +405,26 @@ CONFIG_DRIVERS_EMULATION_QEMU_BOCHS=y
 # CONFIG_INTEL_INT15 is not set
 # CONFIG_INTEL_GMA_ACPI is not set
 # CONFIG_DRIVER_INTEL_I210 is not set
+CONFIG_DRIVERS_INTEL_WIFI=y
 # CONFIG_DRIVER_MAXIM_MAX77686 is not set
 # CONFIG_DRIVER_PARADE_PS8625 is not set
 # CONFIG_DRIVER_PARADE_PS8640 is not set
 CONFIG_DRIVERS_MC146818=y
-CONFIG_MAINBOARD_HAS_LPC_TPM=y
-CONFIG_LPC_TPM=y
-CONFIG_TPM_TIS_BASE_ADDRESS=0xfed40000
-# CONFIG_TPM_INIT_FAILURE_IS_FATAL is not set
-# CONFIG_SKIP_TPM_STARTUP_ON_NORMAL_BOOT is not set
-# CONFIG_TPM_DEACTIVATE is not set
+# CONFIG_MAINBOARD_HAS_LPC_TPM is not set
 # CONFIG_DRIVERS_RICOH_RCE822 is not set
+# CONFIG_DRIVER_SIEMENS_NC_FPGA is not set
 # CONFIG_DRIVERS_SIL_3114 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_DRIVER_XPOWERS_AXP209 is not set
+# CONFIG_ACPI_SATA_GENERATOR is not set
+# CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES is not set
 # CONFIG_RTC is not set
 # CONFIG_TPM is not set
 CONFIG_STACK_SIZE=0x1000
 CONFIG_MMCONF_SUPPORT_DEFAULT=y
 CONFIG_MMCONF_SUPPORT=y
-# CONFIG_BOOTMODE_STRAPS is not set
 
 #
 # Console
@@ -433,8 +453,8 @@ CONFIG_TTYS0_BAUD=115200
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_CONSOLE_QEMU_DEBUGCON=y
 CONFIG_CONSOLE_QEMU_DEBUGCON_PORT=0x402
-# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8 is not set
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7=y
+CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
+# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_4 is not set
@@ -462,7 +482,6 @@ CONFIG_VGA=y
 CONFIG_HAVE_ACPI_TABLES=y
 # CONFIG_COMMON_FADT is not set
 # CONFIG_ACPI_NHLT is not set
-CONFIG_COREBOOT_TABLE_SIZE=0x8000
 
 #
 # System tables
@@ -477,15 +496,17 @@ CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="QEMU x86 q35/ich9"
 #
 # CONFIG_PAYLOAD_NONE is not set
 # CONFIG_PAYLOAD_ELF is not set
+# CONFIG_PAYLOAD_BAYOU is not set
 # CONFIG_PAYLOAD_FILO is not set
 # CONFIG_PAYLOAD_GRUB2 is not set
 # CONFIG_PAYLOAD_SEABIOS is not set
 # CONFIG_PAYLOAD_UBOOT is not set
 CONFIG_PAYLOAD_LINUX=y
 # CONFIG_PAYLOAD_TIANOCORE is not set
-CONFIG_PAYLOAD_FILE="bzImage"
+CONFIG_PAYLOAD_FILE="./bzImage"
 CONFIG_PAYLOAD_OPTIONS=""
-CONFIG_LINUX_COMMAND_LINE="console=ttyS0"
+# CONFIG_PXE is not set
+CONFIG_LINUX_COMMAND_LINE="console=ttyS0 console=tty"
 CONFIG_LINUX_INITRD=""
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
 
@@ -495,6 +516,7 @@ CONFIG_LINUX_INITRD=""
 # CONFIG_COREINFO_SECONDARY_PAYLOAD is not set
 # CONFIG_MEMTEST_SECONDARY_PAYLOAD is not set
 # CONFIG_NVRAMCUI_SECONDARY_PAYLOAD is not set
+# CONFIG_TINT_SECONDARY_PAYLOAD is not set
 
 #
 # Debugging
@@ -510,6 +532,7 @@ CONFIG_LINUX_INITRD=""
 # CONFIG_DEBUG_MALLOC is not set
 # CONFIG_DEBUG_ACPI is not set
 # CONFIG_TRACE is not set
+# CONFIG_DEBUG_BOOT_STATE is not set
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 CONFIG_IASL_WARNINGS_ARE_ERRORS=y
@@ -519,4 +542,5 @@ CONFIG_IASL_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_DEBUG_BOOT_STATE is not set
+# CONFIG_CREATE_BOARD_CHECKLIST is not set
+# CONFIG_MAKE_CHECKLIST_PUBLIC is not set