Update QEMU config

models/qemu/coreboot.config

@@ -72,6 +72,7 @@ CONFIG_VENDOR_EMULATION=y
 # CONFIG_VENDOR_PCENGINES is not set
 # CONFIG_VENDOR_PORTWELL is not set
 # CONFIG_VENDOR_PURISM is not set
+# CONFIG_VENDOR_RAZER is not set
 # CONFIG_VENDOR_RODA is not set
 # CONFIG_VENDOR_SAMSUNG is not set
 # CONFIG_VENDOR_SAPPHIRE is not set
@@ -89,6 +90,7 @@ 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
@@ -120,11 +122,11 @@ CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
 CONFIG_MMCONF_BASE_ADDRESS=0xb0000000
 # CONFIG_HAVE_INTEL_FIRMWARE is not set
 CONFIG_POST_DEVICE=y
-CONFIG_DRIVERS_UART_8250IO=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_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7
 # CONFIG_USBDEBUG is not set
 CONFIG_MAINBOARD_VERSION="1.0"
@@ -173,6 +175,7 @@ CONFIG_MAINBOARD_POWER_FAILURE_STATE=0
 # SoC
 #
 CONFIG_HAVE_BOOTBLOCK=y
+CONFIG_CPU_ADDR_BITS=36
 CONFIG_EHCI_BAR=0xfef00000
 CONFIG_ACPI_CPU_STRING="\\_PR.CP%02d"
 # CONFIG_SOC_CAVIUM_CN81XX is not set
@@ -186,7 +189,8 @@ CONFIG_VERSTAGE_ADDR=0x2000000
 # CONFIG_PCIEXP_ASPM is not set
 # CONFIG_PCIEXP_COMMON_CLOCK is not set
 # CONFIG_PCIEXP_CLK_PM is not set
-CONFIG_CONSOLE_CBMEM=y
+CONFIG_TTYS0_BASE=0x3e8
+CONFIG_HPET_MIN_TICKS=0x80
 CONFIG_UART_PCI_ADDR=0x0
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_MEDIATEK_MT8183 is not set
@@ -221,7 +225,7 @@ CONFIG_CPU_QEMU_X86=y
 # CONFIG_UDELAY_LAPIC is not set
 CONFIG_UDELAY_TSC=y
 # CONFIG_TSC_CONSTANT_RATE is not set
-# CONFIG_TSC_MONOTONIC_TIMER is not set
+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
@@ -235,8 +239,7 @@ 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_CACHE_AS_RAM=y
-CONFIG_NO_CAR_GLOBAL_MIGRATION=y
+# 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
@@ -254,7 +257,6 @@ CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/i82801ix/bootblock.c"
 # 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_RESET=y
 CONFIG_SOUTHBRIDGE_INTEL_COMMON_PMCLIB=y
@@ -292,37 +294,7 @@ 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
-# CONFIG_ARCH_VERSTAGE_ARM is not set
-# CONFIG_ARCH_ROMSTAGE_ARM is not set
-# CONFIG_ARCH_RAMSTAGE_ARM is not set
-# CONFIG_ARCH_BOOTBLOCK_ARMV4 is not set
-# CONFIG_ARCH_VERSTAGE_ARMV4 is not set
-# CONFIG_ARCH_ROMSTAGE_ARMV4 is not set
-# CONFIG_ARCH_RAMSTAGE_ARMV4 is not set
-# CONFIG_ARCH_BOOTBLOCK_ARMV7 is not set
-# CONFIG_ARCH_VERSTAGE_ARMV7 is not set
-# CONFIG_ARCH_ROMSTAGE_ARMV7 is not set
-# CONFIG_ARCH_RAMSTAGE_ARMV7 is not set
-# CONFIG_ARCH_BOOTBLOCK_ARMV7_M is not set
-# CONFIG_ARCH_VERSTAGE_ARMV7_M is not set
-# CONFIG_ARCH_BOOTBLOCK_ARMV7_R is not set
-# CONFIG_ARCH_VERSTAGE_ARMV7_R is not set
-# CONFIG_ARCH_ROMSTAGE_ARMV7_R is not set
-# CONFIG_ARCH_RAMSTAGE_ARMV7_R is not set
 # CONFIG_ARM_LPAE is not set
-# CONFIG_ARCH_ARM64 is not set
-# CONFIG_ARCH_BOOTBLOCK_ARM64 is not set
-# CONFIG_ARCH_VERSTAGE_ARM64 is not set
-# CONFIG_ARCH_ROMSTAGE_ARM64 is not set
-# CONFIG_ARCH_RAMSTAGE_ARM64 is not set
-# CONFIG_ARCH_BOOTBLOCK_ARMV8_64 is not set
-# 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_X86=y
 CONFIG_ARCH_BOOTBLOCK_X86_32=y
 CONFIG_ARCH_VERSTAGE_X86_32=y
@@ -377,6 +349,7 @@ CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT=y
 # CONFIG_VGA_TEXT_FRAMEBUFFER is not set
 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
@@ -424,7 +397,6 @@ 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_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
@@ -487,6 +459,10 @@ 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
@@ -502,22 +478,30 @@ CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
 CONFIG_BOOTBLOCK_CONSOLE=y
 CONFIG_POSTCAR_CONSOLE=y
 CONFIG_SQUELCH_EARLY_SMP=y
-# CONFIG_CONSOLE_SERIAL is not set
+CONFIG_CONSOLE_SERIAL=y
+
+#
+# I/O mapped, 8250-compatible
+#
+
+#
+# Serial port base address = 0x3e8
+#
 # CONFIG_CONSOLE_SERIAL_921600 is not set
 # CONFIG_CONSOLE_SERIAL_460800 is not set
 # CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
+CONFIG_CONSOLE_SERIAL_115200=y
 # CONFIG_CONSOLE_SERIAL_57600 is not set
 # CONFIG_CONSOLE_SERIAL_38400 is not set
 # CONFIG_CONSOLE_SERIAL_19200 is not set
 # CONFIG_CONSOLE_SERIAL_9600 is not set
+CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
+CONFIG_CONSOLE_CBMEM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
 # CONFIG_CONSOLE_SPI_FLASH is not set
-CONFIG_CONSOLE_QEMU_DEBUGCON=y
-CONFIG_CONSOLE_QEMU_DEBUGCON_PORT=0x402
+# CONFIG_CONSOLE_QEMU_DEBUGCON is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8 is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
@@ -535,11 +519,12 @@ CONFIG_POST_DEVICE_NONE=y
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
 CONFIG_HWBASE_DEBUG_CB=y
 # CONFIG_HAVE_ACPI_RESUME is not set
-# CONFIG_ACPI_HUGE_LOWMEM_BACKUP 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_NO_MONOTONIC_TIMER=y
+# CONFIG_NO_MONOTONIC_TIMER is not set
+CONFIG_HAVE_MONOTONIC_TIMER=y
+# CONFIG_TIMER_QUEUE is not set
 CONFIG_HAVE_OPTION_TABLE=y
 # CONFIG_PCI_IO_CFG_EXT is not set
 CONFIG_IOAPIC=y
@@ -555,12 +540,13 @@ CONFIG_HAVE_ACPI_TABLES=y
 # CONFIG_GENERATE_MP_TABLE is not set
 # CONFIG_GENERATE_PIRQ_TABLE is not set
 CONFIG_GENERATE_SMBIOS_TABLES=y
+# CONFIG_SMBIOS_PROVIDED_BY_MOBO is not set
 
 #
 # Payload
 #
 # CONFIG_PAYLOAD_NONE is not set
-# CONFIG_PAYLOAD_ELF 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
@@ -569,18 +555,10 @@ CONFIG_GENERATE_SMBIOS_TABLES=y
 # CONFIG_PAYLOAD_UBOOT is not set
 # CONFIG_PAYLOAD_YABITS is not set
 # CONFIG_PAYLOAD_LINUX is not set
-CONFIG_PAYLOAD_TIANOCORE=y
+# CONFIG_PAYLOAD_TIANOCORE is not set
 CONFIG_PAYLOAD_FILE="$(FIRMWARE_OPEN_UEFIPAYLOAD)"
 CONFIG_PAYLOAD_OPTIONS=""
 # CONFIG_PXE is not set
-CONFIG_TIANOCORE_STABLE=y
-# CONFIG_TIANOCORE_REVISION is not set
-# CONFIG_TIANOCORE_TARGET_IA32 is not set
-CONFIG_TIANOCORE_TARGET_X64=y
-# CONFIG_TIANOCORE_DEBUG is not set
-CONFIG_TIANOCORE_RELEASE=y
-CONFIG_TIANOCORE_USE_8254_TIMER=y
-# CONFIG_TIANOCORE_BOOTSPLASH_IMAGE is not set
 CONFIG_COMPRESSED_PAYLOAD_LZMA=y
 # CONFIG_COMPRESSED_PAYLOAD_LZ4 is not set
 # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set
@@ -606,6 +584,7 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
 #
 # General Debug Settings
 #
+# CONFIG_GDB_STUB is not set
 # CONFIG_FATAL_ASSERTS is not set
 # CONFIG_DEBUG_CBFS is not set
 # CONFIG_HAVE_DEBUG_RAM_SETUP is not set