m68k/mcf5208: 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: Thomas Huth <thuth@redhat.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20200219160953.13771-49-imammedo@redhat.com>
This commit is contained in:
parent
8591a179af
commit
32c245cfaf
|
@ -234,7 +234,6 @@ static void mcf5208evb_init(MachineState *machine)
|
|||
qemu_irq *pic;
|
||||
MemoryRegion *address_space_mem = get_system_memory();
|
||||
MemoryRegion *rom = g_new(MemoryRegion, 1);
|
||||
MemoryRegion *ram = g_new(MemoryRegion, 1);
|
||||
MemoryRegion *sram = g_new(MemoryRegion, 1);
|
||||
|
||||
cpu = M68K_CPU(cpu_create(machine->cpu_type));
|
||||
|
@ -249,8 +248,7 @@ static void mcf5208evb_init(MachineState *machine)
|
|||
memory_region_add_subregion(address_space_mem, 0x00000000, rom);
|
||||
|
||||
/* DRAM at 0x40000000 */
|
||||
memory_region_allocate_system_memory(ram, NULL, "mcf5208.ram", ram_size);
|
||||
memory_region_add_subregion(address_space_mem, 0x40000000, ram);
|
||||
memory_region_add_subregion(address_space_mem, 0x40000000, machine->ram);
|
||||
|
||||
/* Internal SRAM. */
|
||||
memory_region_init_ram(sram, NULL, "mcf5208.sram", 16 * KiB, &error_fatal);
|
||||
|
@ -354,6 +352,7 @@ static void mcf5208evb_machine_init(MachineClass *mc)
|
|||
mc->init = mcf5208evb_init;
|
||||
mc->is_default = 1;
|
||||
mc->default_cpu_type = M68K_CPU_TYPE_NAME("m5208");
|
||||
mc->default_ram_id = "mcf5208.ram";
|
||||
}
|
||||
|
||||
DEFINE_MACHINE("mcf5208evb", mcf5208evb_machine_init)
|
||||
|
|
Loading…
Reference in a new issue