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

[platform/kernel/u-boot.git] / lib_nios2 / bootm.c

diff --git a/lib_nios2/bootm.c b/lib_nios2/bootm.c
index 70d2bb0..01f4e87 100644 (file)
--- a/lib_nios2/bootm.c
+++ b/lib_nios2/bootm.c
@@ -34,20 +34,34 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
 
        /* find kernel entry point */
        if (images->legacy_hdr_valid) {
-               ep = image_get_ep (images->legacy_hdr_os);
+               ep = image_get_ep (&images->legacy_hdr_os_copy);
 #if defined(CONFIG_FIT)
        } else if (images->fit_uname_os) {
-               fit_unsupported_reset ("NIOS2 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;
        }
        void (*kernel)(void) = (void (*)(void))ep;
 
+       if (!images->autostart)
+               return ;
+
        /* For now we assume the Microtronix linux ... which only
         * needs to be called ;-)
         */
        kernel ();
+       /* does not return */
+       return;
+
+error:
+       if (images->autostart)
+               do_reset (cmdtp, flag, argc, argv);
+       return;
 }