ppc/mac_newworld: use memdev for RAM
memory_region_allocate_system_memory() API is going away, so replace it with memdev allocated MemoryRegion. The later is initialized by generic code, so board only needs to opt in to memdev scheme by providing MachineClass::default_ram_id and using MachineState::ram instead of manually initializing RAM memory region. Signed-off-by: Igor Mammedov <imammedo@redhat.com> Acked-by: David Gibson <david@gibson.dropbear.id.au> Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20200219160953.13771-61-imammedo@redhat.com>
This commit is contained in:
parent
9731664559
commit
a5b5de02ac
|
@ -118,7 +118,7 @@ static void ppc_core99_init(MachineState *machine)
|
||||||
char *filename;
|
char *filename;
|
||||||
IrqLines *openpic_irqs;
|
IrqLines *openpic_irqs;
|
||||||
int linux_boot, i, j, k;
|
int linux_boot, i, j, k;
|
||||||
MemoryRegion *ram = g_new(MemoryRegion, 1), *bios = g_new(MemoryRegion, 1);
|
MemoryRegion *bios = g_new(MemoryRegion, 1);
|
||||||
hwaddr kernel_base, initrd_base, cmdline_base = 0;
|
hwaddr kernel_base, initrd_base, cmdline_base = 0;
|
||||||
long kernel_size, initrd_size;
|
long kernel_size, initrd_size;
|
||||||
UNINHostState *uninorth_pci;
|
UNINHostState *uninorth_pci;
|
||||||
|
@ -152,8 +152,7 @@ static void ppc_core99_init(MachineState *machine)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* allocate RAM */
|
/* allocate RAM */
|
||||||
memory_region_allocate_system_memory(ram, NULL, "ppc_core99.ram", ram_size);
|
memory_region_add_subregion(get_system_memory(), 0, machine->ram);
|
||||||
memory_region_add_subregion(get_system_memory(), 0, ram);
|
|
||||||
|
|
||||||
/* allocate and load BIOS */
|
/* allocate and load BIOS */
|
||||||
memory_region_init_ram(bios, NULL, "ppc_core99.bios", BIOS_SIZE,
|
memory_region_init_ram(bios, NULL, "ppc_core99.bios", BIOS_SIZE,
|
||||||
|
@ -586,6 +585,7 @@ static void core99_machine_class_init(ObjectClass *oc, void *data)
|
||||||
#else
|
#else
|
||||||
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("7400_v2.9");
|
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("7400_v2.9");
|
||||||
#endif
|
#endif
|
||||||
|
mc->default_ram_id = "ppc_core99.ram";
|
||||||
mc->ignore_boot_device_suffixes = true;
|
mc->ignore_boot_device_suffixes = true;
|
||||||
fwc->get_dev_path = core99_fw_dev_path;
|
fwc->get_dev_path = core99_fw_dev_path;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue