From 97db046678822baf9ec3cb9430ec47ed87d0c89e Mon Sep 17 00:00:00 2001 From: Hervé Poussineau Date: Tue, 1 Apr 2014 23:19:15 +0200 Subject: prep: Remove PCI memory hack related to OpenHack'Ware Signed-off-by: Hervé Poussineau Signed-off-by: Andreas Färber --- hw/pci-host/prep.c | 4 +--- hw/ppc/prep.c | 9 --------- 2 files changed, 1 insertion(+), 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) -- cgit v1.2.3-55-g7522 From 56de2e52693aac6ce2cfbf80a8be6ae75660f58c Mon Sep 17 00:00:00 2001 From: Hervé Poussineau Date: Tue, 1 Apr 2014 23:19:16 +0200 Subject: prep: Remove CPU reset entry point hack related to OpenHack'Ware Signed-off-by: Hervé Poussineau Signed-off-by: Andreas Färber --- hw/ppc/prep.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 567f56e20c..aa8717d75d 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -346,9 +346,6 @@ static void ppc_prep_reset(void *opaque) PowerPCCPU *cpu = opaque; cpu_reset(CPU(cpu)); - - /* Reset address */ - cpu->env.nip = 0xfffffffc; } static const MemoryRegionPortio prep_portio_list[] = { -- cgit v1.2.3-55-g7522 From ee0f2601b911e53e27827cc105d194bb311e6224 Mon Sep 17 00:00:00 2001 From: Andreas Färber Date: Fri, 4 Jul 2014 17:35:32 +0200 Subject: prep: Update ppc_rom.bin This replaces QEMU-side workarounds for PCI BARs and CPU reset. Signed-off-by: Andreas Färber --- pc-bios/ppc_rom.bin | Bin 1048576 -> 1048576 bytes roms/openhackware | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pc-bios/ppc_rom.bin b/pc-bios/ppc_rom.bin index e7f769328b..174a24744b 100644 Binary files a/pc-bios/ppc_rom.bin and b/pc-bios/ppc_rom.bin differ diff --git a/roms/openhackware b/roms/openhackware index 1af7e55425..c559da7c8e 160000 --- a/roms/openhackware +++ b/roms/openhackware @@ -1 +1 @@ -Subproject commit 1af7e55425e58a6dcb5133b092fcf16f8c654fb9 +Subproject commit c559da7c8eec5e45ef1f67978827af6f0b9546f5 -- cgit v1.2.3-55-g7522