mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-07 09:43:56 -06:00
uninorth: remove obsolete pci_pmac_u3_init() function
Instead wire up the PCI/AGP host bridges in mac_newworld.c. Now this is complete it is possible to move the initialisation of the PCI hole alias into pci_u3_agp_init(). Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
7b19318bee
commit
8ce3f743c7
2 changed files with 17 additions and 26 deletions
|
@ -345,7 +345,18 @@ static void ppc_core99_init(MachineState *machine)
|
|||
|
||||
if (PPC_INPUT(env) == PPC_FLAGS_INPUT_970) {
|
||||
/* 970 gets a U3 bus */
|
||||
uninorth_pci = pci_pmac_u3_init(pic, get_system_memory());
|
||||
/* Uninorth AGP bus */
|
||||
dev = qdev_create(NULL, TYPE_U3_AGP_HOST_BRIDGE);
|
||||
qdev_prop_set_ptr(dev, "pic-irqs", pic);
|
||||
qdev_init_nofail(dev);
|
||||
uninorth_pci = U3_AGP_HOST_BRIDGE(dev);
|
||||
s = SYS_BUS_DEVICE(dev);
|
||||
/* PCI hole */
|
||||
memory_region_add_subregion(get_system_memory(), 0x80000000ULL,
|
||||
sysbus_mmio_get_region(s, 2));
|
||||
sysbus_mmio_map(s, 0, 0xf0800000);
|
||||
sysbus_mmio_map(s, 1, 0xf0c00000);
|
||||
|
||||
machine_arch = ARCH_MAC99_U3;
|
||||
} else {
|
||||
/* Use values found on a real PowerMac */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue