diff options
| author | Dirk Müller <dirk@dmllr.de> | 2015-04-04 14:24:38 +0200 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-04-08 17:30:36 +0100 |
| commit | c8623c0215e18eb4a8ec73eba014d97e51ed707e (patch) | |
| tree | 97e3c93bdef107d2b3a4efc8ac0fc6b77fc6c960 /hw/arm/omap2.c | |
| parent | 5a24f20a7208a58fb80d78ca0521bba6f4d7b145 (diff) | |
arm: memory: Replace memory_region_init_ram with memory_region_allocate_system_memory
Commit 0b183fc871:"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.
Signed-off-by: Dirk Mueller <dmueller@suse.com>
Message-id: CAL5wTH4UHYKpJF=dLJfFzxpufjY189chnCow47-ySuLf8GLbug@mail.gmail.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/omap2.c')
| -rw-r--r-- | hw/arm/omap2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c index 32390140c0..e39b317290 100644 --- a/hw/arm/omap2.c +++ b/hw/arm/omap2.c @@ -20,6 +20,7 @@ #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" +#include "hw/boards.h" #include "hw/hw.h" #include "hw/arm/arm.h" #include "hw/arm/omap.h" @@ -2271,9 +2272,8 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion *sysmem, omap_clk_init(s); /* Memory-mapped stuff */ - memory_region_init_ram(&s->sdram, NULL, "omap2.dram", s->sdram_size, - &error_abort); - vmstate_register_ram_global(&s->sdram); + memory_region_allocate_system_memory(&s->sdram, NULL, "omap2.dram", + s->sdram_size); memory_region_add_subregion(sysmem, OMAP2_Q2_BASE, &s->sdram); memory_region_init_ram(&s->sram, NULL, "omap2.sram", s->sram_size, &error_abort); |