summaryrefslogtreecommitdiff
path: root/src/drivers/emulation/qemu
diff options
context:
space:
mode:
Diffstat (limited to 'src/drivers/emulation/qemu')
-rw-r--r--src/drivers/emulation/qemu/Kconfig19
-rw-r--r--src/drivers/emulation/qemu/Makefile.mk2
2 files changed, 15 insertions, 6 deletions
diff --git a/src/drivers/emulation/qemu/Kconfig b/src/drivers/emulation/qemu/Kconfig
index 11231ae52e..0a1a0788b0 100644
--- a/src/drivers/emulation/qemu/Kconfig
+++ b/src/drivers/emulation/qemu/Kconfig
@@ -11,18 +11,27 @@ config DRIVERS_EMULATION_QEMU_BOCHS
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 c9d94bdca0..619782fb1e 100644
--- a/src/drivers/emulation/qemu/Makefile.mk
+++ b/src/drivers/emulation/qemu/Makefile.mk
@@ -6,4 +6,4 @@ postcar-$(CONFIG_CONSOLE_QEMU_DEBUGCON) += qemu_debugcon.c
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