|
@@ -831,7 +831,6 @@ static void ppce500_power_off(void *opaque, int line, int on)
|
|
void ppce500_init(MachineState *machine)
|
|
void ppce500_init(MachineState *machine)
|
|
{
|
|
{
|
|
MemoryRegion *address_space_mem = get_system_memory();
|
|
MemoryRegion *address_space_mem = get_system_memory();
|
|
- MemoryRegion *ram = g_new(MemoryRegion, 1);
|
|
|
|
PPCE500MachineState *pms = PPCE500_MACHINE(machine);
|
|
PPCE500MachineState *pms = PPCE500_MACHINE(machine);
|
|
const PPCE500MachineClass *pmc = PPCE500_MACHINE_GET_CLASS(machine);
|
|
const PPCE500MachineClass *pmc = PPCE500_MACHINE_GET_CLASS(machine);
|
|
PCIBus *pci_bus;
|
|
PCIBus *pci_bus;
|
|
@@ -912,9 +911,7 @@ void ppce500_init(MachineState *machine)
|
|
}
|
|
}
|
|
|
|
|
|
/* Register Memory */
|
|
/* Register Memory */
|
|
- memory_region_allocate_system_memory(ram, NULL, "mpc8544ds.ram",
|
|
|
|
- machine->ram_size);
|
|
|
|
- memory_region_add_subregion(address_space_mem, 0, ram);
|
|
|
|
|
|
+ memory_region_add_subregion(address_space_mem, 0, machine->ram);
|
|
|
|
|
|
dev = qdev_create(NULL, "e500-ccsr");
|
|
dev = qdev_create(NULL, "e500-ccsr");
|
|
object_property_add_child(qdev_get_machine(), "e500-ccsr",
|
|
object_property_add_child(qdev_get_machine(), "e500-ccsr",
|