mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

strongarm: Use cpu_arm_init() to store ARMCPU in StrongARMState

Browse Source 
Adapt collie accordingly.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Andreas Färber 2012-05-14 01:42:57 +02:00
parent 5c6f4f178b
commit 8bf502e2a6
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/collie.c
View File

@ -54,7 +54,7 @@ static void collie_init(ram_addr_t ram_size,
collie_binfo.kernel_cmdline = kernel_cmdline; collie_binfo.kernel_cmdline = kernel_cmdline;
collie_binfo.initrd_filename = initrd_filename; collie_binfo.initrd_filename = initrd_filename;
collie_binfo.board_id = 0x208; collie_binfo.board_id = 0x208;
arm_load_kernel(s->env, &collie_binfo); arm_load_kernel(&s->cpu->env, &collie_binfo);
} }
static QEMUMachine collie_machine = { static QEMUMachine collie_machine = {

6
hw/strongarm.c
View File

@ -1563,9 +1563,9 @@ StrongARMState *sa1110_init(MemoryRegion *sysmem,
exit(1); 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"); error_report("Unable to find CPU definition");
exit(1); exit(1);
} }
@ -1574,7 +1574,7 @@ StrongARMState *sa1110_init(MemoryRegion *sysmem,
vmstate_register_ram_global(&s->sdram); vmstate_register_ram_global(&s->sdram);
memory_region_add_subregion(sysmem, SA_SDCS0, &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, s->pic = sysbus_create_varargs("strongarm_pic", 0x90050000,
pic[ARM_PIC_CPU_IRQ], pic[ARM_PIC_CPU_FIQ], NULL); pic[ARM_PIC_CPU_IRQ], pic[ARM_PIC_CPU_FIQ], NULL);

2
hw/strongarm.h
View File

@ -53,7 +53,7 @@ enum {
}; };
typedef struct { typedef struct {
CPUARMState *env; ARMCPU *cpu;
MemoryRegion sdram; MemoryRegion sdram;
DeviceState *pic; DeviceState *pic;
DeviceState *gpio; DeviceState *gpio;