From: Marian Balakowicz <m8@semihalf.com>
Date: Wed, 12 Mar 2008 09:14:57 +0000 (+0100)
Subject: [new uImage] Re-enable interrupts for non automatic booting
X-Git-Tag: v1.3.3-rc1~141^2^2~24
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a44a269a905f924b420020506a4d7d7eedcc0eaf;p=oweals%2Fu-boot.git

[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>
---

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 96d09e68d4..aca54b5a57 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;
 }