Revision e03c22a9 hw/nseries.c

b/hw/nseries.c
1016 1016
    n800_dss_init(&s->blizzard);
1017 1017

  
1018 1018
    /* CPU setup */
1019
    s->cpu->env->regs[15] = s->cpu->env->boot_info->loader_start;
1020 1019
    s->cpu->env->GE = 0x5;
1021 1020

  
1022 1021
    /* If the machine has a slided keyboard, open it */
......
1317 1316
    if (usb_enabled)
1318 1317
        n8x0_usb_setup(s);
1319 1318

  
1320
    /* Setup initial (reset) machine state */
1321

  
1322
    /* Start at the OneNAND bootloader.  */
1323
    s->cpu->env->regs[15] = 0;
1324

  
1325 1319
    if (kernel_filename) {
1326 1320
        /* Or at the linux loader.  */
1327 1321
        binfo->kernel_filename = kernel_filename;
......
1330 1324
        arm_load_kernel(s->cpu->env, binfo);
1331 1325

  
1332 1326
        qemu_register_reset(n8x0_boot_init, s);
1333
        n8x0_boot_init(s);
1334 1327
    }
1335 1328

  
1336 1329
    if (option_rom[0] && (boot_device[0] == 'n' || !kernel_filename)) {

Also available in: Unified diff