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/strongarm.c | |
| parent | 5a24f20a7208a58fb80d78ca0521bba6f4d7b145 (diff) | |
| download | focaccia-qemu-c8623c0215e18eb4a8ec73eba014d97e51ed707e.tar.gz focaccia-qemu-c8623c0215e18eb4a8ec73eba014d97e51ed707e.zip | |
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/strongarm.c')
| -rw-r--r-- | hw/arm/strongarm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c index 32063459dd..1ddea6d89c 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -26,6 +26,8 @@ * Contributions after 2012-01-13 are licensed under the terms of the * GNU GPL, version 2 or (at your option) any later version. */ + +#include "hw/boards.h" #include "hw/sysbus.h" #include "strongarm.h" #include "qemu/error-report.h" @@ -1604,9 +1606,8 @@ StrongARMState *sa1110_init(MemoryRegion *sysmem, exit(1); } - memory_region_init_ram(&s->sdram, NULL, "strongarm.sdram", sdram_size, - &error_abort); - vmstate_register_ram_global(&s->sdram); + memory_region_allocate_system_memory(&s->sdram, NULL, "strongarm.sdram", + sdram_size); memory_region_add_subregion(sysmem, SA_SDCS0, &s->sdram); s->pic = sysbus_create_varargs("strongarm_pic", 0x90050000, |