Commit de9258a8 authored by bellard's avatar bellard
Browse files

specific VGA BIOS for Cirrus VGA Card


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@905 c046a42c-6fe2-441c-8c8c-71466251a162
parent 37f53b4c
......@@ -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 */
......
......@@ -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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment