diff options
| author | Hervé Poussineau <hpoussin@reactos.org> | 2014-04-01 23:19:15 +0200 |
|---|---|---|
| committer | Andreas Färber <andreas.faerber@web.de> | 2014-07-07 16:46:35 +0200 |
| commit | 97db046678822baf9ec3cb9430ec47ed87d0c89e (patch) | |
| tree | e0b7c5e6b8e83c32a38b949b1657fbd6793851ca /hw | |
| parent | f811d4743b358bc53a8c79576c903c0dbee29e72 (diff) | |
| download | qemu-97db046678822baf9ec3cb9430ec47ed87d0c89e.tar.gz | |
prep: Remove PCI memory hack related to OpenHack'Ware
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/pci-host/prep.c | 4 | ||||
| -rw-r--r-- | hw/ppc/prep.c | 9 |
2 files changed, 1 insertions, 12 deletions
diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 40145408ef..ec6f186251 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -256,9 +256,7 @@ static void raven_pcihost_initfn(Object *obj) memory_region_init(&s->pci_io, obj, "pci-io", 0x3f800000); memory_region_init_io(&s->pci_io_non_contiguous, obj, &raven_io_ops, s, "pci-io-non-contiguous", 0x00800000); - /* Open Hack'Ware hack: real size should be only 0x3f000000 bytes */ - memory_region_init(&s->pci_memory, obj, "pci-memory", - 0x3f000000 + 0xc0000000ULL); + memory_region_init(&s->pci_memory, obj, "pci-memory", 0x3f000000); address_space_init(&s->pci_io_as, &s->pci_io, "raven-io"); /* CPU address space */ diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 2383254f49..567f56e20c 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -382,7 +382,6 @@ static void ppc_prep_init(MachineState *machine) #endif int linux_boot, i, nb_nics1; MemoryRegion *ram = g_new(MemoryRegion, 1); - MemoryRegion *vga = g_new(MemoryRegion, 1); uint32_t kernel_base, initrd_base; long kernel_size, initrd_size; DeviceState *dev; @@ -508,14 +507,6 @@ static void ppc_prep_init(MachineState *machine) /* init basic PC hardware */ pci_vga_init(pci_bus); - /* Open Hack'Ware hack: PCI BAR#0 is programmed to 0xf0000000. - * While bios will access framebuffer at 0xf0000000, real physical - * address is 0xf0000000 + 0xc0000000 (PCI memory base). - * Alias the wrong memory accesses to the right place. - */ - memory_region_init_alias(vga, NULL, "vga-alias", pci_address_space(pci), - 0xf0000000, 0x1000000); - memory_region_add_subregion_overlap(sysmem, 0xf0000000, vga, 10); nb_nics1 = nb_nics; if (nb_nics1 > NE2000_NB_MAX) |