A VGA card for the Malta board.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2494 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/hw/gt64xxx.c b/hw/gt64xxx.c
index 2b01da7..9d6bb44 100644 (file)
--- a/hw/gt64xxx.c
+++ b/hw/gt64xxx.c
@@ -239,6 +239,7 @@ static void gt64120_pci_mapping(GT64120State *s)
       /* Map new IO address */
       s->PCI0IO_start = s->regs[GT_PCI0IOLD] << 21;
       s->PCI0IO_length = ((s->regs[GT_PCI0IOHD] + 1) - (s->regs[GT_PCI0IOLD] & 0x7f)) << 21;
+      isa_mem_base = s->PCI0IO_start;
       isa_mmio_init(s->PCI0IO_start, s->PCI0IO_length);
     }
 }

diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index b215cd5..54b813b 100644 (file)
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -719,6 +719,10 @@ void mips_malta_init (int ram_size, int vga_ram_size, int boot_device,
 
     /* Network card */
     network_init(pci_bus);
+
+    /* Optional PCI video card */
+    pci_cirrus_vga_init(pci_bus, ds, phys_ram_base + ram_size,
+                        ram_size, vga_ram_size);
 }
 
 QEMUMachine mips_malta_machine = {