diff options
| author | aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-02-08 14:51:19 +0000 |
|---|---|---|
| committer | aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-02-08 14:51:19 +0000 |
| commit | 1f605a76410e6b596948323b3515e04fc06da80f (patch) | |
| tree | 25fa66e71fbb65bf17a33afd8697b174a4dd4d56 | |
| parent | b4abdfa4fbf4afaa7540ddaf814236e7844935ff (diff) | |
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
| -rw-r--r-- | Makefile.target | 1 | ||||
| -rw-r--r-- | hw/mips_malta.c | 10 | ||||
| -rw-r--r-- | qemu-doc.texi | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/Makefile.target b/Makefile.target index 3d49d97303..5158c89366 100644 --- a/Makefile.target +++ b/Makefile.target @@ -614,6 +614,7 @@ OBJS+= ide.o gt64xxx.o pckbd.o ps2.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds122 OBJS+= piix_pci.o parallel.o cirrus_vga.o pcspk.o $(SOUND_HW) OBJS+= mipsnet.o OBJS+= pflash_cfi01.o +OBJS+= vmware_vga.o CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE endif ifeq ($(TARGET_BASE_ARCH), cris) diff --git a/hw/mips_malta.c b/hw/mips_malta.c index b7afb2d9a5..af1abb85ad 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 = { diff --git a/qemu-doc.texi b/qemu-doc.texi index b2fa19e750..7905b5606b 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -2700,7 +2700,7 @@ PCnet32 PCI network card @item Malta FPGA serial device @item -Cirrus VGA graphics card +Cirrus (default) or any other PCI VGA graphics card @end itemize The ACER Pica emulation supports: |