aboutsummaryrefslogtreecommitdiff
path: root/hw/mips_malta.c
diff options
context:
space:
mode:
authoraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2009-02-08 14:51:19 +0000
committeraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2009-02-08 14:51:19 +0000
commit1f605a76410e6b596948323b3515e04fc06da80f (patch)
tree25fa66e71fbb65bf17a33afd8697b174a4dd4d56 /hw/mips_malta.c
parentb4abdfa4fbf4afaa7540ddaf814236e7844935ff (diff)
downloadqemu-1f605a76410e6b596948323b3515e04fc06da80f.zip
qemu-1f605a76410e6b596948323b3515e04fc06da80f.tar.gz
qemu-1f605a76410e6b596948323b3515e04fc06da80f.tar.bz2
Additional VGA options for MIPS Malta
Support all kinds of pci vga cards (including none) Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6557 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/mips_malta.c')
-rw-r--r--hw/mips_malta.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index b7afb2d..af1abb8 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -941,8 +941,16 @@ void mips_malta_init (ram_addr_t ram_size, int vga_ram_size,
network_init(pci_bus);
/* Optional PCI video card */
- pci_cirrus_vga_init(pci_bus, phys_ram_base + ram_size,
+ if (cirrus_vga_enabled) {
+ pci_cirrus_vga_init(pci_bus, phys_ram_base + ram_size,
+ ram_size, vga_ram_size);
+ } else if (vmsvga_enabled) {
+ pci_vmsvga_init(pci_bus, phys_ram_base + ram_size,
ram_size, vga_ram_size);
+ } else if (std_vga_enabled) {
+ pci_vga_init(pci_bus, phys_ram_base + ram_size,
+ ram_size, vga_ram_size, 0, 0);
+ }
}
QEMUMachine mips_malta_machine = {