浏览代码

[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>
Marian Balakowicz 17 年之前
父节点
当前提交
a44a269a90
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5 1
      common/cmd_bootm.c

+ 5 - 1
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;
 }