[new uImage] Add new uImage format support to arch specific do_bootm_linux() routines

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

diff --git a/lib_mips/bootm.c b/lib_mips/bootm.c
index 5e7a46031d80160b73c9ba50ffd893649adc7325..e4c139efab1914616a69ec84c47ce1a876de8976 100644 (file)
--- a/lib_mips/bootm.c
+++ b/lib_mips/bootm.c
@@ -60,19 +60,23 @@ 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 ("MIPS linux bootm");
-               do_reset (cmdtp, flag, argc, argv);
+               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;
        }
        theKernel = (void (*)(int, char **, char **, int *))ep;
 
        ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_MIPS,
                        &initrd_start, &initrd_end);
        if (ret)
-               do_reset (cmdtp, flag, argc, argv);
+               goto error;
 
        show_boot_progress (15);
 
@@ -116,6 +120,13 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
        printf ("\nStarting kernel ...\n\n");
 
        theKernel (linux_argc, linux_argv, linux_env, 0);
+       /* does not return */
+       return;
+
+error:
+       if (images->autostart)
+               do_reset (cmdtp, flag, argc, argv);
+       return;
 }
 
 static void linux_params_init (ulong start, char *line)