diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-05-04 00:42:39 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-06-04 23:00:41 +0200 |
| commit | 5f4ef08b20ece1b3711bcfb3751efb13986d17e5 (patch) | |
| tree | 18eb37664743669762b8753d928ec54b04e97be8 /hw/nseries.c | |
| parent | 43824588af2fa77f9586e16ef2f01d1990c6460e (diff) | |
| download | focaccia-qemu-5f4ef08b20ece1b3711bcfb3751efb13986d17e5.tar.gz focaccia-qemu-5f4ef08b20ece1b3711bcfb3751efb13986d17e5.zip | |
omap: Use cpu_arm_init() to store ARMCPU in omap_mpu_state_s
Fix tab indentations of comments, add braces, use cpu_reset(). Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/nseries.c')
| -rw-r--r-- | hw/nseries.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/nseries.c b/hw/nseries.c index a5cfa8ccbc..b8c6a29227 100644 --- a/hw/nseries.c +++ b/hw/nseries.c @@ -1023,7 +1023,7 @@ static void n8x0_boot_init(void *opaque) n800_dss_init(&s->blizzard); /* CPU setup */ - s->cpu->env->GE = 0x5; + s->cpu->cpu->env.GE = 0x5; /* If the machine has a slided keyboard, open it */ if (s->kbd) @@ -1329,7 +1329,7 @@ static void n8x0_init(ram_addr_t ram_size, const char *boot_device, binfo->kernel_filename = kernel_filename; binfo->kernel_cmdline = kernel_cmdline; binfo->initrd_filename = initrd_filename; - arm_load_kernel(s->cpu->env, binfo); + arm_load_kernel(&s->cpu->cpu->env, binfo); qemu_register_reset(n8x0_boot_init, s); } @@ -1338,7 +1338,7 @@ static void n8x0_init(ram_addr_t ram_size, const char *boot_device, int rom_size; uint8_t nolo_tags[0x10000]; /* No, wait, better start at the ROM. */ - s->cpu->env->regs[15] = OMAP2_Q2_BASE + 0x400000; + s->cpu->cpu->env.regs[15] = OMAP2_Q2_BASE + 0x400000; /* This is intended for loading the `secondary.bin' program from * Nokia images (the NOLO bootloader). The entry point seems |