diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | hw/pc.c | 7 | ||||
| -rw-r--r-- | pc-bios/README | 4 | ||||
| -rw-r--r-- | pc-bios/vgabios-cirrus.bin | bin | 0 -> 26784 bytes |
4 files changed, 12 insertions, 1 deletions
@@ -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 \ @@ -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 b5f0bc9e26..b5e9bf709d 100644 --- 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 Binary files differnew file mode 100644 index 0000000000..f393404b62 --- /dev/null +++ b/pc-bios/vgabios-cirrus.bin |