Revision 17c2f0bf hw/xilinx_zynq.c
b/hw/xilinx_zynq.c | ||
---|---|---|
50 | 50 |
const char *kernel_filename, const char *kernel_cmdline, |
51 | 51 |
const char *initrd_filename, const char *cpu_model) |
52 | 52 |
{ |
53 |
CPUARMState *env = NULL;
|
|
53 |
ARMCPU *cpu;
|
|
54 | 54 |
MemoryRegion *address_space_mem = get_system_memory(); |
55 | 55 |
MemoryRegion *ext_ram = g_new(MemoryRegion, 1); |
56 | 56 |
MemoryRegion *ocm_ram = g_new(MemoryRegion, 1); |
... | ... | |
66 | 66 |
cpu_model = "cortex-a9"; |
67 | 67 |
} |
68 | 68 |
|
69 |
env = cpu_init(cpu_model);
|
|
70 |
if (!env) {
|
|
69 |
cpu = cpu_arm_init(cpu_model);
|
|
70 |
if (!cpu) {
|
|
71 | 71 |
fprintf(stderr, "Unable to find CPU definition\n"); |
72 | 72 |
exit(1); |
73 | 73 |
} |
74 |
irqp = arm_pic_init_cpu(env); |
|
74 |
irqp = arm_pic_init_cpu(&cpu->env);
|
|
75 | 75 |
cpu_irq = irqp[ARM_PIC_CPU_IRQ]; |
76 | 76 |
|
77 | 77 |
/* max 2GB ram */ |
Also available in: Unified diff