[S] Change in coreboot[main]: drivers/qemu: Split Cirrus display support from Bochs display support

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/80375?usp=email )

Change subject: drivers/qemu: Split Cirrus display support from Bochs display support
......................................................................

drivers/qemu: Split Cirrus display support from Bochs display support

QEMU's Cirrus display device is supported along with the Bochs driver
since commit 7905f9254ebc ("qemu: cirrus native video init"). It is no
longer the default since QEMU 2.2. The code supporting it can work
independently of the Bochs display driver and depends more heavily on
port I/O and VGA support code, so split it from that code to make it
easier to support the Bochs driver in other architectures.

Change-Id: Ic9492b501ed4fdcbda6886db60b1e5348715e667
Signed-off-by: Alper Nebi Yasak 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80375
Tested-by: build bot (Jenkins) 
Reviewed-by: Nico Huber 
---
M src/drivers/emulation/qemu/Kconfig
M src/drivers/emulation/qemu/Makefile.mk
2 files changed, 15 insertions(+), 6 deletions(-)

Approvals:
  Nico Huber: Looks good to me, approved
  build bot (Jenkins): Verified

diff --git a/src/drivers/emulation/qemu/Kconfig b/src/drivers/emulation/qemu/Kconfig
index 11231ae..0a1a078 100644
--- a/src/drivers/emulation/qemu/Kconfig
+++ b/src/drivers/emulation/qemu/Kconfig
@@ -11,18 +11,27 @@
    help
       VGA driver for qemu emulated vga cards supporting
       the bochs dispi interface.  This includes
-	   standard vga, vmware svga and qxl.  The default
-	   vga (cirrus) is *not* supported, so you have to
-	   pick another one explicitly via 'qemu -vga $card'.
+	   standard vga, vmware svga, and qxl.
+
+config DRIVERS_EMULATION_QEMU_CIRRUS
+	bool "cirrus svga driver"
+	default y
+	depends on CPU_QEMU_X86
+	depends on MAINBOARD_DO_NATIVE_VGA_INIT
+	select HAVE_VGA_TEXT_FRAMEBUFFER
+	select HAVE_LINEAR_FRAMEBUFFER
+	select VGA
+	help
+	   VGA driver for qemu emulated cirrus svga card.

config DRIVERS_EMULATION_QEMU_BOCHS_XRES
    int "bochs vga xres"
    default 800
    depends on LINEAR_FRAMEBUFFER
-	depends on DRIVERS_EMULATION_QEMU_BOCHS
+	depends on DRIVERS_EMULATION_QEMU_BOCHS || DRIVERS_EMULATION_QEMU_CIRRUS

config DRIVERS_EMULATION_QEMU_BOCHS_YRES
    int "bochs vga yres"
    default 600
    depends on LINEAR_FRAMEBUFFER
-	depends on DRIVERS_EMULATION_QEMU_BOCHS
+	depends on DRIVERS_EMULATION_QEMU_BOCHS || DRIVERS_EMULATION_QEMU_CIRRUS
diff --git a/src/drivers/emulation/qemu/Makefile.mk b/src/drivers/emulation/qemu/Makefile.mk
index c9d94bd..619782f 100644
--- a/src/drivers/emulation/qemu/Makefile.mk
+++ b/src/drivers/emulation/qemu/Makefile.mk
@@ -6,4 +6,4 @@
 ramstage-$(CONFIG_CONSOLE_QEMU_DEBUGCON) += qemu_debugcon.c

ramstage-$(CONFIG_DRIVERS_EMULATION_QEMU_BOCHS) += bochs.c
-ramstage-$(CONFIG_DRIVERS_EMULATION_QEMU_BOCHS) += cirrus.c
+ramstage-$(CONFIG_DRIVERS_EMULATION_QEMU_CIRRUS) += cirrus.c