mx31 litekit support

[u-boot] / lib_blackfin / bootm.c

diff --git a/lib_blackfin/bootm.c b/lib_blackfin/bootm.c
index 26ac88b267bbe506c25a19c3d6cc6997c0979613..1ea80f4e363d6865a53d4b2906cb3898f1213df6 100644 (file)
--- a/lib_blackfin/bootm.c
+++ b/lib_blackfin/bootm.c
@@ -53,6 +53,9 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
        char    *cmdline;
        ulong   ep = 0;
 
+       if (!images->autostart)
+               return ;
+
 #ifdef SHARED_RESOURCES
        swap_to(FLASH);
 #endif
@@ -62,12 +65,16 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
                ep = image_get_ep (images->legacy_hdr_os);
 #if defined(CONFIG_FIT)
        } else if (images->fit_uname_os) {
-               fit_unsupported_reset ("AVR32 linux bootm");
-               do_reset (cmdtp, flag, argc, argv);
+               int ret = fit_image_get_entry (images->fit_hdr_os,
+                               images->fit_noffset_os, &ep);
+               if (ret) {
+                       puts ("Can't get entry point property!\n");
+                       goto error;
+               }
 #endif
        } else {
                puts ("Could not find kernel entry point!\n");
-               do_reset (cmdtp, flag, argc, argv);
+               goto error;
        }
        appl = (int (*)(char *))ep;
 
@@ -82,6 +89,13 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
                dcache_disable();
        }
        (*appl) (cmdline);
+       /* does not return */
+       return;
+
+error:
+       if (images->autostart)
+               do_reset (cmdtp, flag, argc, argv);
+       return;
 }
 
 char *make_command_line(void)