diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-05-03 23:47:04 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-06-04 23:00:40 +0200 |
| commit | 43824588af2fa77f9586e16ef2f01d1990c6460e (patch) | |
| tree | b81b86b0e85995fd730c7e12b9e6ee0b27bb0bff /hw/mainstone.c | |
| parent | df90dadb4507afa31fdc85f94d8571e7aa25b80b (diff) | |
pxa2xx: Use cpu_arm_init() and store ARMCPU
Also use cpu_reset() in place of cpu_state_reset().
Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/mainstone.c')
| -rw-r--r-- | hw/mainstone.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/mainstone.c b/hw/mainstone.c index 27f59009f6..00a8adc850 100644 --- a/hw/mainstone.c +++ b/hw/mainstone.c @@ -168,7 +168,7 @@ static void mainstone_common_init(MemoryRegion *address_space_mem, mainstone_binfo.kernel_cmdline = kernel_cmdline; mainstone_binfo.initrd_filename = initrd_filename; mainstone_binfo.board_id = arm_id; - arm_load_kernel(cpu->env, &mainstone_binfo); + arm_load_kernel(&cpu->cpu->env, &mainstone_binfo); } static void mainstone_init(ram_addr_t ram_size, |