Merge branch 'master' of git://www.denx.de/git/u-boot-arm

[u-boot] / lib_arm / bootm.c

diff --git a/lib_arm/bootm.c b/lib_arm/bootm.c
index b838c374ac6aed033106b8ec91d100565eefab20..955a1ae3a200ed108fac0ad4f7cc082006529a6c 100644 (file)
--- a/lib_arm/bootm.c
+++ b/lib_arm/bootm.c
@@ -137,9 +137,6 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
        setup_end_tag (bd);
 #endif
 
-       if (!images->autostart)
-               return ;
-
        /* we assume that the kernel is in place */
        printf ("\nStarting kernel ...\n\n");
 
@@ -157,8 +154,7 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
        return;
 
 error:
-       if (images->autostart)
-               do_reset (cmdtp, flag, argc, argv);
+       do_reset (cmdtp, flag, argc, argv);
        return;
 }