diff options
| author | Andreas Färber | 2012-05-14 02:55:25 +0200 |
|---|---|---|
| committer | Andreas Färber | 2012-06-11 00:23:04 +0200 |
| commit | 17c2f0bf37182d46d66998bf037b2cac520d2183 (patch) | |
| tree | d555b01c0a3792b06dbaa17b44eeee2d8b0ec896 | |
| parent | pxa2xx_gpio: Store ARMCPU in PXA2xxGPIOInfo (diff) | |
| download | qemu-17c2f0bf37182d46d66998bf037b2cac520d2183.tar.gz qemu-17c2f0bf37182d46d66998bf037b2cac520d2183.tar.xz qemu-17c2f0bf37182d46d66998bf037b2cac520d2183.zip | |
xilinx_zynq: Use cpu_arm_init() to obtain ARMCPU
Needed for arm_load_kernel().
Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Peter A.G. Crosthwaite <peter.crosthwaite@petalogix.com>
| -rw-r--r-- | hw/xilinx_zynq.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/xilinx_zynq.c b/hw/xilinx_zynq.c index 7290c64a4c..68349e2722 100644 --- a/hw/xilinx_zynq.c +++ b/hw/xilinx_zynq.c @@ -50,7 +50,7 @@ static void zynq_init(ram_addr_t ram_size, const char *boot_device, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { - CPUARMState *env = NULL; + ARMCPU *cpu; MemoryRegion *address_space_mem = get_system_memory(); MemoryRegion *ext_ram = g_new(MemoryRegion, 1); MemoryRegion *ocm_ram = g_new(MemoryRegion, 1); @@ -66,12 +66,12 @@ static void zynq_init(ram_addr_t ram_size, const char *boot_device, cpu_model = "cortex-a9"; } - env = cpu_init(cpu_model); - if (!env) { + cpu = cpu_arm_init(cpu_model); + if (!cpu) { fprintf(stderr, "Unable to find CPU definition\n"); exit(1); } - irqp = arm_pic_init_cpu(env); + irqp = arm_pic_init_cpu(&cpu->env); cpu_irq = irqp[ARM_PIC_CPU_IRQ]; /* max 2GB ram */ |