sim-card
/
qemu
Archived
10
0
Fork 0
Code Releases Activity

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
This commit is contained in:
aurel32 2009-02-08 14:51:19 +00:00
parent b4abdfa4fb
commit 1f605a7641
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.target
View File

@ -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)

10
hw/mips_malta.c
View File

@ -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 = {

2
qemu-doc.texi
View File

@ -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: