summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2007-03-18 22:18:43 +0000
committerths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2007-03-18 22:18:43 +0000
commit11f295118c5b78910b0b26c1a856944016895ec8 (patch)
tree8f56cb899700f24b65e7fbb62475c31d0adc3466
parent39d51eb8bcc603c02342d8f5e1f7a569e5f17e06 (diff)
downloadqemu-11f295118c5b78910b0b26c1a856944016895ec8.tar.gz
A VGA card for the Malta board.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2494 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--hw/gt64xxx.c1
-rw-r--r--hw/mips_malta.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/hw/gt64xxx.c b/hw/gt64xxx.c
index 2b01da70b8..9d6bb44eb9 100644
--- 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 b215cd58a8..54b813bdfe 100644
--- 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 = {