[new uImage] Re-enable interrupts for non automatic booting
authorMarian Balakowicz <m8@semihalf.com>
Wed, 12 Mar 2008 09:14:57 +0000 (10:14 +0100)
committerMarian Balakowicz <m8@semihalf.com>
Wed, 12 Mar 2008 09:14:57 +0000 (10:14 +0100)
Re-enable interrupts if we return from do_bootm_<os> and 'autostart'
environment variable is not set to 'yes'.

Signed-off-by: Marian Balakowicz <m8@semihalf.com>
common/cmd_bootm.c

index 96d09e6..aca54b5 100644 (file)
@@ -342,8 +342,12 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        show_boot_progress (-9);
 #ifdef DEBUG
        puts ("\n## Control returned to monitor - resetting...\n");
-       do_reset (cmdtp, flag, argc, argv);
+       if (images.autostart)
+               do_reset (cmdtp, flag, argc, argv);
 #endif
+       if (!images.autostart && iflag)
+               enable_interrupts();
+
        return 1;
 }