aboutsummaryrefslogtreecommitdiff
path: root/hw/arm/highbank.c
diff options
context:
space:
mode:
authorDirk Müller <dirk@dmllr.de>2015-04-04 14:24:38 +0200
committerPeter Maydell <peter.maydell@linaro.org>2015-04-08 17:30:36 +0100
commitc8623c0215e18eb4a8ec73eba014d97e51ed707e (patch)
tree97e3c93bdef107d2b3a4efc8ac0fc6b77fc6c960 /hw/arm/highbank.c
parent5a24f20a7208a58fb80d78ca0521bba6f4d7b145 (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/highbank.c')
-rw-r--r--hw/arm/highbank.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c
index 07cb4e057b..dd2a67bcf0 100644
--- a/hw/arm/highbank.c
+++ b/hw/arm/highbank.c
@@ -267,7 +267,7 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id)
sysmem = get_system_memory();
dram = g_new(MemoryRegion, 1);
- memory_region_init_ram(dram, NULL, "highbank.dram", ram_size, &error_abort);
+ memory_region_allocate_system_memory(dram, NULL, "highbank.dram", ram_size);
/* SDRAM at address zero. */
memory_region_add_subregion(sysmem, 0, dram);