diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-05-14 01:42:57 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-06-11 00:23:03 +0200 |
| commit | 8bf502e2a64f8f4ed37d9b16f367378ebf237ccb (patch) | |
| tree | 5bdeeb3d071c7ab819038c42e66395e27840cc30 /hw/strongarm.c | |
| parent | 5c6f4f178ba542358c012ca033985f73e61b8ae5 (diff) | |
| download | focaccia-qemu-8bf502e2a64f8f4ed37d9b16f367378ebf237ccb.tar.gz focaccia-qemu-8bf502e2a64f8f4ed37d9b16f367378ebf237ccb.zip | |
strongarm: Use cpu_arm_init() to store ARMCPU in StrongARMState
Adapt collie accordingly. Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/strongarm.c')
| -rw-r--r-- | hw/strongarm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/strongarm.c b/hw/strongarm.c index 1b15f399f1..38b1d0c1e0 100644 --- a/hw/strongarm.c +++ b/hw/strongarm.c @@ -1563,9 +1563,9 @@ StrongARMState *sa1110_init(MemoryRegion *sysmem, exit(1); } - s->env = cpu_init(rev); + s->cpu = cpu_arm_init(rev); - if (!s->env) { + if (!s->cpu) { error_report("Unable to find CPU definition"); exit(1); } @@ -1574,7 +1574,7 @@ StrongARMState *sa1110_init(MemoryRegion *sysmem, vmstate_register_ram_global(&s->sdram); memory_region_add_subregion(sysmem, SA_SDCS0, &s->sdram); - pic = arm_pic_init_cpu(s->env); + pic = arm_pic_init_cpu(&s->cpu->env); s->pic = sysbus_create_varargs("strongarm_pic", 0x90050000, pic[ARM_PIC_CPU_IRQ], pic[ARM_PIC_CPU_FIQ], NULL); |