From a44a269a905f924b420020506a4d7d7eedcc0eaf Mon Sep 17 00:00:00 2001 From: Marian Balakowicz Date: Wed, 12 Mar 2008 10:14:57 +0100 Subject: [new uImage] Re-enable interrupts for non automatic booting Re-enable interrupts if we return from do_bootm_ and 'autostart' environment variable is not set to 'yes'. Signed-off-by: Marian Balakowicz --- common/cmd_bootm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'common/cmd_bootm.c') diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 96d09e68d..aca54b5a5 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; } -- cgit v1.2.3