specific VGA BIOS for Cirrus VGA Card

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@905 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/Makefile b/Makefile
index 4137e9b95b249c6b82101c5903fc8cb353bafd4c..d4c4b0ffef8a6d0bacbd46b827b0142491decf34 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -50,6 +50,7 @@ ifndef CONFIG_WIN32
 endif
        mkdir -p "$(datadir)"
        install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin \
+                       pc-bios/vgabios-cirrus.bin \
                        pc-bios/linux_boot.bin "$(datadir)"
        mkdir -p "$(docdir)"
        install -m 644 qemu-doc.html  qemu-tech.html "$(docdir)"
@@ -97,6 +98,7 @@ tarbin:
         $(bindir)/qemu-mkcow $(bindir)/vmdk2raw \
        $(datadir)/bios.bin \
        $(datadir)/vgabios.bin \
+       $(datadir)/vgabios-cirrus.bin \
        $(datadir)/linux_boot.bin \
        $(docdir)/qemu-doc.html \
        $(docdir)/qemu-tech.html \

diff --git a/hw/pc.c b/hw/pc.c
index 788854b2931d7f3282097923f7f786298366e2c3..a40e1d03f26ccaf28165d328580fdfadd54f7226 100644 (file)
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -28,6 +28,7 @@
 
 #define BIOS_FILENAME "bios.bin"
 #define VGABIOS_FILENAME "vgabios.bin"
+#define VGABIOS_CIRRUS_FILENAME "vgabios-cirrus.bin"
 #define LINUX_BOOT_FILENAME "linux_boot.bin"
 
 #define KERNEL_LOAD_ADDR     0x00100000
@@ -320,7 +321,11 @@ void pc_init(int ram_size, int vga_ram_size, int boot_device,
     }
     
     /* VGA BIOS load */
-    snprintf(buf, sizeof(buf), "%s/%s", bios_dir, VGABIOS_FILENAME);
+    if (cirrus_vga_enabled) {
+        snprintf(buf, sizeof(buf), "%s/%s", bios_dir, VGABIOS_CIRRUS_FILENAME);
+    } else {
+        snprintf(buf, sizeof(buf), "%s/%s", bios_dir, VGABIOS_FILENAME);
+    }
     ret = load_image(buf, phys_ram_base + 0x000c0000);
     
     /* setup basic memory access */

diff --git a/pc-bios/README b/pc-bios/README
index b5f0bc9e267c2e0fda744f157f585d95cc169e1c..b5e9bf709d3b63e01ad1f1ce8ce8157f724b5037 100644 (file)
--- a/pc-bios/README
+++ b/pc-bios/README
@@ -3,3 +3,7 @@
 
 - The VGA BIOS comes from the LGPL VGA bios project
   (http://www.nongnu.org/vgabios/).
+
+- The Cirrus VGA BIOS comes from the LGPL VGA bios project with
+  patches from http://ebisa.hp.infoseek.co.jp/bochs/index.shtml.
+  
\ No newline at end of file

diff --git a/pc-bios/vgabios-cirrus.bin b/pc-bios/vgabios-cirrus.bin
new file mode 100644 (file)
index 0000000..f393404
Binary files /dev/null and b/pc-bios/vgabios-cirrus.bin differ