[new uImage] Respect autostart setting in linux bootm

[karo-tx-uboot.git] / lib_ppc / bootm.c

diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c
index 59cc2a44718ebf83c9d9a60c58f3660c65d6d5b4..1afef46df7531bbd7467b3e419c4d93af4775fc1 100644 (file)
--- a/lib_ppc/bootm.c
+++ b/lib_ppc/bootm.c
@@ -242,6 +242,8 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
 #if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500)
        unlock_ram_in_cache();
 #endif
+       if (!images->autostart)
+               return ;
 
 #if defined(CONFIG_OF_LIBFDT)
        if (of_flat_tree) {     /* device tree; boot new style */
@@ -270,7 +272,8 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
        return ;
 
 error:
-       do_reset (cmdtp, flag, argc, argv);
+       if (images->autostart)
+               do_reset (cmdtp, flag, argc, argv);
        return ;
 }