summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMarian Balakowicz <m8@semihalf.com>2008-03-12 10:14:57 +0100
committerMarian Balakowicz <m8@semihalf.com>2008-03-12 10:14:57 +0100
commita44a269a905f924b420020506a4d7d7eedcc0eaf (patch)
tree0037b08fdd890a7c4b04a5e7beeb1daa88b45971 /common
parentd985c8498c4e47095820da97aa722381d39172c5 (diff)
downloadu-boot-imx-a44a269a905f924b420020506a4d7d7eedcc0eaf.zip
u-boot-imx-a44a269a905f924b420020506a4d7d7eedcc0eaf.tar.gz
u-boot-imx-a44a269a905f924b420020506a4d7d7eedcc0eaf.tar.bz2
[new uImage] Re-enable interrupts for non automatic booting
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>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_bootm.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 96d09e6..aca54b5 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -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;
}