Commit b7ccb83f authored by Dirk Müller's avatar Dirk Müller Committed by Peter Maydell
Browse files

lm32: memory: Replace memory_region_init_ram with memory_region_allocate_system_memory 



Commit 0b183fc8:"memory: move mem_path handling to
memory_region_allocate_system_memory" split memory_region_init_ram and
memory_region_init_ram_from_file. Also it moved mem-path handling a step
up from memory_region_init_ram to memory_region_allocate_system_memory.

Therefore for any board that uses memory_region_init_ram directly,
-mem-path is not supported.

Fix this by replacing memory_region_init_ram with
memory_region_allocate_system_memory.

Cc: Michael Walle <michael@walle.cc>
Signed-off-by: default avatarDirk Mueller <dmueller@suse.com>
Acked-by: default avatarMichael Walle <michael@walle.cc>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 81b23ef8

hw/lm32/lm32_boards.c

+4 −6
Original line number Diff line number Diff line
@@ -111,9 +111,8 @@ static void lm32_evr_init(MachineState *machine) 


    reset_info->flash_base = flash_base;



    memory_region_init_ram(phys_ram, NULL, "lm32_evr.sdram", ram_size,

                           &error_abort);

    vmstate_register_ram_global(phys_ram);

    memory_region_allocate_system_memory(phys_ram, NULL, "lm32_evr.sdram",

                                         ram_size);

    memory_region_add_subregion(address_space_mem, ram_base, phys_ram);



    dinfo = drive_get(IF_PFLASH, 0, 0);
@@ -214,9 +213,8 @@ static void lm32_uclinux_init(MachineState *machine) 


    reset_info->flash_base = flash_base;



    memory_region_init_ram(phys_ram, NULL, "lm32_uclinux.sdram", ram_size,

                           &error_abort);

    vmstate_register_ram_global(phys_ram);

    memory_region_allocate_system_memory(phys_ram, NULL,

                                         "lm32_uclinux.sdram", ram_size);

    memory_region_add_subregion(address_space_mem, ram_base, phys_ram);



    dinfo = drive_get(IF_PFLASH, 0, 0);

hw/lm32/milkymist.c

+2 −3
Original line number Diff line number Diff line
@@ -118,9 +118,8 @@ milkymist_init(MachineState *machine) 


    cpu_lm32_set_phys_msb_ignore(env, 1);



    memory_region_init_ram(phys_sdram, NULL, "milkymist.sdram", sdram_size,

                           &error_abort);

    vmstate_register_ram_global(phys_sdram);

    memory_region_allocate_system_memory(phys_sdram, NULL, "milkymist.sdram",

                                         sdram_size);

    memory_region_add_subregion(address_space_mem, sdram_base, phys_sdram);



    dinfo = drive_get(IF_PFLASH, 0, 0);