commit 9c6edc4d27ec29ca7b57bbeef75baefd2f7e6cb2
author Gerd Hoffmann <kraxel@redhat.com> Wed Apr 08 10:49:25 2015 +0200
committer Gerd Hoffmann <kraxel@redhat.com> Thu Jun 11 09:23:03 2015 +0200
tree 873e5c0051a739b9a70a73397775efeec8ebaba4
parent 624e812764beda88b47c0018b1cee3b86d5c59eb

vga: simplify vga builds

Add a kconfig menu to pick the vga variant, stick the vendorr
and device ids as defaults into Kconfig.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

vgasrc/Kconfig

diff --git a/vgasrc/Kconfig b/vgasrc/Kconfig
index 27a24c9..391eecd 100644
--- a/vgasrc/Kconfig
+++ b/vgasrc/Kconfig
@@ -58,6 +58,22 @@
     endchoice
 
     choice
+        depends on VGA_BOCHS
+        prompt "bochs vga variant"
+        default VGA_BOCHS_STDVGA
+
+        config VGA_BOCHS_STDVGA
+            bool "qemu stdvga / bochs svga"
+
+        config VGA_BOCHS_VMWARE
+            bool "qemu vmware svga"
+
+        config VGA_BOCHS_QXL
+            bool "qemu qxl vga"
+
+    endchoice
+
+    choice
         depends on VGA_GEODEGX2 || VGA_GEODELX
         prompt "Output Mode"
         default VGA_OUTPUT_CRT
@@ -140,7 +156,9 @@
         hex
         prompt "PCI Vendor ID" if OVERRIDE_PCI_ID
         default 0x1013 if VGA_CIRRUS
-        default 0x1234 if VGA_BOCHS
+        default 0x1234 if VGA_BOCHS_STDVGA
+        default 0x15ad if VGA_BOCHS_VMWARE
+        default 0x1b36 if VGA_BOCHS_QXL
         default 0x100b if VGA_GEODEGX2
         default 0x1022 if VGA_GEODELX
         default 0x0000
@@ -152,7 +170,9 @@
         hex
         prompt "PCI Vendor ID" if OVERRIDE_PCI_ID
         default 0x00b8 if VGA_CIRRUS
-        default 0x1111 if VGA_BOCHS
+        default 0x1111 if VGA_BOCHS_STDVGA
+        default 0x0405 if VGA_BOCHS_VMWARE
+        default 0x0100 if VGA_BOCHS_QXL
         default 0x0030 if VGA_GEODEGX2
         default 0x2081 if VGA_GEODELX
         default 0x0000