PowerPC Reference Platform (PReP)
* Update OpenHack'Ware firmware to replace QEMU-side workarounds -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABAgAGBQJTurOGAAoJEPou0S0+fgE/ZIcP/RfsK7KBF7Zu6RH2VRnmNUGZ gvlHv/IMW70fp4EUuAakyWsUWdDlCoYlgVtr00wsHr5BTyzUZcqjHsU+r6oa5Bw+ ic+8IQ7vSAqghU0K47xoTcPOJ+TPRlP8VW+CF3nsX3TF2my5C/ntXq8xtcxm5KxV 43Cd7ewwJxHabqhcdFPPmUs0y/IhpIebusdl1lnS/OMCjldNR+aCQ0OeuLBHP51C m31Try/LmwsuGJAcPCgmlqrRn4wCQdPpGnyGKtD5nVZFbbcLnp2L3McJS5wu0eCn 8H0EeCw3lAoaDUldMsCny1cbCK/lOeQMFWiU4YtF55U6BcLz8pEnxC6/xMLD3MLq xsq8MjDs+tfBV36gtWRHmS7DhlL+fNNKb+iRhQfCGq0bRFuL2mg80YO78V7bEWQy D46EJqM2y5B0HIxJOKABTfKa1Im6auffiK+YPC1w/t4me4z4nlfn9V3VJwObqhpC Ebt+0Wm9XOhMX8ML/dfjQODknvlMq2xAp3YcXiC6W+WE14uh/KYOo2PksMLTxQXG /KOkXBkFZCWTRXzCUaK+DGMya2Sw51diJkozM37baPDOsWlNpSTZtM7Qn/+ZfkPA av2bxqHRS1eJqCQ220KKQ5z53alS3FCtKFNW9pnPPB+7bxIyzIwo1A4VMUNLd9IG aIeA+tpPztFBuzAfyQCr =E0WH -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/afaerber/tags/prep-for-2.1' into staging PowerPC Reference Platform (PReP) * Update OpenHack'Ware firmware to replace QEMU-side workarounds # gpg: Signature made Mon 07 Jul 2014 15:49:42 BST using RSA key ID 3E7E013F # gpg: Good signature from "Andreas Färber <afaerber@suse.de>" # gpg: aka "Andreas Färber <afaerber@suse.com>" * remotes/afaerber/tags/prep-for-2.1: prep: Update ppc_rom.bin prep: Remove CPU reset entry point hack related to OpenHack'Ware prep: Remove PCI memory hack related to OpenHack'Ware Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
128f0e6614
|
@ -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 */
|
||||
|
|
|
@ -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[] = {
|
||||
|
@ -382,7 +379,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 +504,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)
|
||||
|
|
Binary file not shown.
|
@ -1 +1 @@
|
|||
Subproject commit 1af7e55425e58a6dcb5133b092fcf16f8c654fb9
|
||||
Subproject commit c559da7c8eec5e45ef1f67978827af6f0b9546f5
|
Loading…
Reference in a new issue