diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-20 08:43:00 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-20 08:43:00 -0500 |
| commit | 46cd37e7718f6c2c502228a61b3a0811c849c52f (patch) | |
| tree | 9f294a290b09a548892b90151a571740297aaf7e /hw/collie.c | |
| parent | 1f99b94932fcf0a543e46e24875fc2b3a8c304a7 (diff) | |
| parent | d08151bf7c022cec3e488d72ed9c429b04979f40 (diff) | |
| download | focaccia-qemu-46cd37e7718f6c2c502228a61b3a0811c849c52f.tar.gz focaccia-qemu-46cd37e7718f6c2c502228a61b3a0811c849c52f.zip | |
Merge remote-tracking branch 'qemu-kvm-tmp/memory/batch' into staging
Diffstat (limited to 'hw/collie.c')
| -rw-r--r-- | hw/collie.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/collie.c b/hw/collie.c index a10cc1b90c..8dd6e4ec7e 100644 --- a/hw/collie.c +++ b/hw/collie.c @@ -13,6 +13,7 @@ #include "arm-misc.h" #include "flash.h" #include "blockdev.h" +#include "exec-memory.h" static struct arm_boot_info collie_binfo = { .loader_start = SA_SDCS0, @@ -26,12 +27,13 @@ static void collie_init(ram_addr_t ram_size, { StrongARMState *s; DriveInfo *dinfo; + MemoryRegion *sysmem = get_system_memory(); if (!cpu_model) { cpu_model = "sa1110"; } - s = sa1110_init(collie_binfo.ram_size, cpu_model); + s = sa1110_init(sysmem, collie_binfo.ram_size, cpu_model); dinfo = drive_get(IF_PFLASH, 0, 0); pflash_cfi01_register(SA_CS0, NULL, "collie.fl1", 0x02000000, |