3 files changed, 49 insertions, 5 deletions
diff --git a/resources/coreboot/qemu_x86_12mb/board.cfg b/resources/coreboot/qemu_x86_12mb/board.cfg
index 46ca564b..1c267aa3 100644
--- a/resources/coreboot/qemu_x86_12mb/board.cfg
+++ b/resources/coreboot/qemu_x86_12mb/board.cfg
@@ -6,4 +6,4 @@ payload_grub_withseabios="y"
 payload_seabios="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-#payload_uboot="y"
+payload_uboot="y"
diff --git a/resources/coreboot/qemu_x86_12mb/config/libgfxinit_corebootfb b/resources/coreboot/qemu_x86_12mb/config/libgfxinit_corebootfb
index 07e823c2..0a0463fb 100644
--- a/resources/coreboot/qemu_x86_12mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/qemu_x86_12mb/config/libgfxinit_corebootfb
@@ -120,6 +120,7 @@ CONFIG_POST_IO=y
 CONFIG_OVERRIDE_DEVICETREE=""
 CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
 CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_UART_FOR_CONSOLE=0
 # CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE=y
 # CONFIG_BOARD_EMULATION_QEMU_AARCH64 is not set
@@ -138,6 +139,7 @@ CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 # CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_CONSOLE_SERIAL=y
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X230"
 CONFIG_PCIEXP_HOTPLUG_BUSES=8
 CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
@@ -145,7 +147,7 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
 CONFIG_PS2K_EISAID="PNP0303"
 CONFIG_PS2M_EISAID="PNP0F13"
 # CONFIG_PCIEXP_CLK_PM is not set
-# CONFIG_DRIVERS_UART_8250IO is not set
+CONFIG_DRIVERS_UART_8250IO=y
 CONFIG_HEAP_SIZE=0x8000
 CONFIG_BOARD_ROMSIZE_KB_256=y
 # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -188,6 +190,8 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
 CONFIG_INTEL_GMA_BCLM_WIDTH=16
 CONFIG_PCIEXP_ASPM=y
 CONFIG_PCIEXP_COMMON_CLOCK=y
+CONFIG_TTYS0_BASE=0x3f8
+CONFIG_TTYS0_LCS=3
 CONFIG_UART_PCI_ADDR=0x0
 
 #
@@ -290,6 +294,7 @@ CONFIG_RESOURCE_ALLOCATOR_V4=y
 # Generic Drivers
 #
 CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
+CONFIG_DRIVERS_UART=y
 # CONFIG_DRIVERS_UART_OXPCIE is not set
 # CONFIG_VPD is not set
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS=y
@@ -343,10 +348,26 @@ CONFIG_BOOT_DEVICE_NOT_SPI_FLASH=y
 CONFIG_BOOTBLOCK_CONSOLE=y
 CONFIG_POSTCAR_CONSOLE=y
 CONFIG_SQUELCH_EARLY_SMP=y
+
+#
+# I/O mapped, 8250-compatible
+#
+
+#
+# Serial port base address = 0x3f8
+#
+# 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=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_DUMP_TO_UART is not set
 # CONFIG_CONSOLE_SPI_FLASH is not set
 CONFIG_CONSOLE_QEMU_DEBUGCON=y
 CONFIG_CONSOLE_QEMU_DEBUGCON_PORT=0x402
@@ -425,6 +446,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_DEBUG_PIRQ is not set
diff --git a/resources/coreboot/qemu_x86_12mb/config/libgfxinit_txtmode b/resources/coreboot/qemu_x86_12mb/config/libgfxinit_txtmode
index ff8eff3d..c37f9da8 100644
--- a/resources/coreboot/qemu_x86_12mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/qemu_x86_12mb/config/libgfxinit_txtmode
@@ -120,6 +120,7 @@ CONFIG_POST_IO=y
 CONFIG_OVERRIDE_DEVICETREE=""
 CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
 CONFIG_CMOS_LAYOUT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.layout"
+CONFIG_UART_FOR_CONSOLE=0
 # CONFIG_CONSOLE_POST is not set
 CONFIG_POST_DEVICE=y
 # CONFIG_BOARD_EMULATION_QEMU_AARCH64 is not set
@@ -138,6 +139,7 @@ CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 # CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
+CONFIG_CONSOLE_SERIAL=y
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X230"
 CONFIG_PCIEXP_HOTPLUG_BUSES=8
 CONFIG_PCIEXP_HOTPLUG_MEM=0x800000
@@ -145,7 +147,7 @@ CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM=0x10000000
 CONFIG_PS2K_EISAID="PNP0303"
 CONFIG_PS2M_EISAID="PNP0F13"
 # CONFIG_PCIEXP_CLK_PM is not set
-# CONFIG_DRIVERS_UART_8250IO is not set
+CONFIG_DRIVERS_UART_8250IO=y
 CONFIG_HEAP_SIZE=0x8000
 CONFIG_BOARD_ROMSIZE_KB_256=y
 # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set
@@ -188,6 +190,8 @@ CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
 CONFIG_INTEL_GMA_BCLM_WIDTH=16
 CONFIG_PCIEXP_ASPM=y
 CONFIG_PCIEXP_COMMON_CLOCK=y
+CONFIG_TTYS0_BASE=0x3f8
+CONFIG_TTYS0_LCS=3
 CONFIG_UART_PCI_ADDR=0x0
 
 #
@@ -288,6 +292,7 @@ CONFIG_RESOURCE_ALLOCATOR_V4=y
 # Generic Drivers
 #
 CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
+CONFIG_DRIVERS_UART=y
 # CONFIG_DRIVERS_UART_OXPCIE is not set
 # CONFIG_VPD is not set
 CONFIG_DRIVERS_EMULATION_QEMU_BOCHS=y
@@ -339,10 +344,26 @@ CONFIG_BOOT_DEVICE_NOT_SPI_FLASH=y
 CONFIG_BOOTBLOCK_CONSOLE=y
 CONFIG_POSTCAR_CONSOLE=y
 CONFIG_SQUELCH_EARLY_SMP=y
+
+#
+# I/O mapped, 8250-compatible
+#
+
+#
+# Serial port base address = 0x3f8
+#
+# 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=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_DUMP_TO_UART is not set
 # CONFIG_CONSOLE_SPI_FLASH is not set
 CONFIG_CONSOLE_QEMU_DEBUGCON=y
 CONFIG_CONSOLE_QEMU_DEBUGCON_PORT=0x402
@@ -421,6 +442,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_DEBUG_PIRQ is not set