diff options
| author | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-10 02:24:36 +0000 |
|---|---|---|
| committer | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-10 02:24:36 +0000 |
| commit | b584726df971c1238a5249cc21121cf2ebbcaf55 (patch) | |
| tree | 32b73d21de064d8b3c28750d35608cac701d1863 /hw/ppc_oldworld.c | |
| parent | a8b01dd87f3f1cb93d51ce87b13f57fe5415e33e (diff) | |
| download | qemu-b584726df971c1238a5249cc21121cf2ebbcaf55.tar.gz | |
Clean up VGA ram allocation.
Signed-off-by: Paul Brook <paul@codesourcery.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7063 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/ppc_oldworld.c')
| -rw-r--r-- | hw/ppc_oldworld.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c index 4b4bd8becd..a29999293f 100644 --- a/hw/ppc_oldworld.c +++ b/hw/ppc_oldworld.c @@ -125,7 +125,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size, int vga_ram_size, char buf[1024]; qemu_irq *pic, **heathrow_irqs; int linux_boot, i; - ram_addr_t ram_offset, vga_ram_offset, bios_offset, vga_bios_offset; + ram_addr_t ram_offset, bios_offset, vga_bios_offset; uint32_t kernel_base, initrd_base; int32_t kernel_size, initrd_size; PCIBus *pci_bus; @@ -169,9 +169,6 @@ static void ppc_heathrow_init (ram_addr_t ram_size, int vga_ram_size, ram_offset = qemu_ram_alloc(ram_size); cpu_register_physical_memory(0, ram_size, ram_offset); - /* allocate VGA RAM */ - vga_ram_offset = qemu_ram_alloc(vga_ram_size); - /* allocate and load BIOS */ bios_offset = qemu_ram_alloc(BIOS_SIZE); if (bios_name == NULL) @@ -303,8 +300,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size, int vga_ram_size, } pic = heathrow_pic_init(&pic_mem_index, 1, heathrow_irqs); pci_bus = pci_grackle_init(0xfec00000, pic); - pci_vga_init(pci_bus, phys_ram_base + vga_ram_offset, - vga_ram_offset, vga_ram_size, + pci_vga_init(pci_bus, vga_ram_size, vga_bios_offset, vga_bios_size); escc_mem_index = escc_init(0x80013000, pic[0x0f], pic[0x10], serial_hds[0], |