[new uImage] Respect autostart setting in linux bootm

[u-boot] / lib_m68k / bootm.c

diff --git a/lib_m68k/bootm.c b/lib_m68k/bootm.c
index eca044ecead67be3db6951a6677610b8c6cc24f5..e12d1d4aaddea8f2c305e2809ec5039dd57eb727 100644 (file)
--- a/lib_m68k/bootm.c
+++ b/lib_m68k/bootm.c
@@ -127,6 +127,8 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag,
 
        show_boot_progress (15);
 
+       if (!images->autostart)
+               return;
        /*
         * Linux Kernel Parameters (passing board info data):
         *   r3: ptr to board info data
@@ -140,7 +142,8 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag,
        return ;
 
 error:
-       do_reset (cmdtp, flag, argc, argv);
+       if (images->autostart)
+               do_reset (cmdtp, flag, argc, argv);
        return ;
 }