aboutsummaryrefslogtreecommitdiff
path: root/hw/collie.c
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2011-10-03 14:14:20 +0200
committerAvi Kivity <avi@redhat.com>2011-10-17 15:59:18 +0200
commiteb2fefbc44d8b25ff94f697adf60752ae2864c93 (patch)
treec4ef198a1187a2c6157c39e06f2abb2ee51cd37a /hw/collie.c
parent7cc09e6c4b51978a656ff5e6c0a5faafec2d82e6 (diff)
strongarm: convert to memory API
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/collie.c')
-rw-r--r--hw/collie.c4
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,