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>

diff --git a/vgasrc/Kconfig b/vgasrc/Kconfig
index 27a24c95d84c31175cd8323c56f75930c76498dc..391eecda0dfeb3b428b4a87882d807cc6e402c45 100644 (file)
--- a/vgasrc/Kconfig
+++ b/vgasrc/Kconfig
@@ -57,6 +57,22 @@ menu "VGA ROM"
 
     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"
@@ -140,7 +156,9 @@ menu "VGA ROM"
         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 @@ menu "VGA ROM"
         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