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_prep.c | |
| parent | a8b01dd87f3f1cb93d51ce87b13f57fe5415e33e (diff) | |
| download | qemu-b584726df971c1238a5249cc21121cf2ebbcaf55.zip | |
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_prep.c')
| -rw-r--r-- | hw/ppc_prep.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index 61f6518032..07b572639e 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -543,7 +543,7 @@ static void ppc_prep_init (ram_addr_t ram_size, int vga_ram_size, m48t59_t *m48t59; int PPC_io_memory; int linux_boot, i, nb_nics1, bios_size; - ram_addr_t ram_offset, vga_ram_offset, bios_offset; + ram_addr_t ram_offset, bios_offset; uint32_t kernel_base, kernel_size, initrd_base, initrd_size; PCIBus *pci_bus; qemu_irq *i8259; @@ -580,9 +580,6 @@ static void ppc_prep_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) @@ -663,8 +660,7 @@ static void ppc_prep_init (ram_addr_t ram_size, int vga_ram_size, cpu_register_physical_memory(0x80000000, 0x00800000, PPC_io_memory); /* init basic PC hardware */ - pci_vga_init(pci_bus, phys_ram_base + vga_ram_offset, - vga_ram_offset, vga_ram_size, 0, 0); + pci_vga_init(pci_bus, vga_ram_size, 0, 0); // openpic = openpic_init(0x00000000, 0xF0000000, 1); // pit = pit_init(0x40, i8259[0]); rtc_init(0x70, i8259[8], 2000); |