Commit 1f605a76410e6b596948323b3515e04fc06da80f
1 parent
b4abdfa4
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
Showing
3 changed files
with
11 additions
and
2 deletions
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 |
| 614 | 614 | OBJS+= piix_pci.o parallel.o cirrus_vga.o pcspk.o $(SOUND_HW) |
| 615 | 615 | OBJS+= mipsnet.o |
| 616 | 616 | OBJS+= pflash_cfi01.o |
| 617 | +OBJS+= vmware_vga.o | |
| 617 | 618 | CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE |
| 618 | 619 | endif |
| 619 | 620 | ifeq ($(TARGET_BASE_ARCH), cris) | ... | ... |
hw/mips_malta.c
| ... | ... | @@ -941,8 +941,16 @@ void mips_malta_init (ram_addr_t ram_size, int vga_ram_size, |
| 941 | 941 | network_init(pci_bus); |
| 942 | 942 | |
| 943 | 943 | /* Optional PCI video card */ |
| 944 | - pci_cirrus_vga_init(pci_bus, phys_ram_base + ram_size, | |
| 944 | + if (cirrus_vga_enabled) { | |
| 945 | + pci_cirrus_vga_init(pci_bus, phys_ram_base + ram_size, | |
| 946 | + ram_size, vga_ram_size); | |
| 947 | + } else if (vmsvga_enabled) { | |
| 948 | + pci_vmsvga_init(pci_bus, phys_ram_base + ram_size, | |
| 945 | 949 | ram_size, vga_ram_size); |
| 950 | + } else if (std_vga_enabled) { | |
| 951 | + pci_vga_init(pci_bus, phys_ram_base + ram_size, | |
| 952 | + ram_size, vga_ram_size, 0, 0); | |
| 953 | + } | |
| 946 | 954 | } |
| 947 | 955 | |
| 948 | 956 | QEMUMachine mips_malta_machine = { | ... | ... |
qemu-doc.texi