Add configuration menu for the VGA ROM

This patch adds a configuration menu for the VGA ROM, it also allow
the creation of a PCI header so the ROM can be extracted from a PCI
device.

V2: Default Device IDs and Vendor IDs values for Cirrus and Bochs are now set
    by Kconfig.

Signed-off-by: Julian Pidancet <julian.pidancet@gmail.com>

diff --git a/src/Kconfig b/src/Kconfig
index f8d245a678cb86a917a40908dff898bbce77264f..ad16502e2367c8efba82e2a9df4692bca42acab0 100644 (file)
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -324,6 +324,45 @@ menu "BIOS Tables"
             Support generation of ACPI tables.
 endmenu
 
+menu "VGA ROM"
+    config VGA_CIRRUS
+        bool "QEMU Cirrus CLGD 54xx VGA BIOS"
+        default n
+        help
+            Build support for Cirrus VGA emulation.
+    
+    config VGA_BOCHS
+        bool "Bochs DISPI interface VGA BIOS"
+        default n
+        help
+            Build support for Bochs DISPI interface
+    
+    config VGA_PCI
+        bool "PCI ROM Headers"
+        default y
+        help
+            Build PCI ROM headers so the vga rom can be extracted from
+            a PCI device.
+
+    config VGA_VID
+        depends on VGA_PCI
+        hex "PCI Vendor ID"
+        default 0x1013 if VGA_CIRRUS
+        default 0x1234 if VGA_BOCHS
+        default 0x0000
+        help
+            Vendor ID for the PCI ROM
+    
+    config VGA_DID
+        depends on VGA_PCI
+        hex "PCI Device ID"
+        default 0x00b8 if VGA_CIRRUS
+        default 0x1111 if VGA_BOCHS
+        default 0x0000
+        help
+            Device ID for the PCI ROM
+endmenu
+
 menu "Debugging"
     config DEBUG_LEVEL
         int "Debug level"

diff --git a/vgasrc/vga.c b/vgasrc/vga.c
index 748ddd49bfe0fd643a2459b42cf1fa7eeaad1ac4..3988da9c9a58b451ace2829cd433a76e9d90b1f4 100644 (file)
--- a/vgasrc/vga.c
+++ b/vgasrc/vga.c
@@ -18,10 +18,6 @@
 #include "optionroms.h" // struct pci_data
 #include "config.h" // CONFIG_*
 
-// XXX
-#define CONFIG_VGA_BOCHS 0
-#define CONFIG_VGA_CIRRUS 0
-
 // XXX
 #define DEBUG_VGA_POST 1
 #define DEBUG_VGA_10 3