bootm: refactor do_reset and os boot function args

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

diff --git a/lib_microblaze/bootm.c b/lib_microblaze/bootm.c
index fab4a54418c35c0ccccfbb86b52b18fb5ded532c..5986a31cc8313c7afd7ca19e2c3e641a4fa7f3c2 100644 (file)
--- a/lib_microblaze/bootm.c
+++ b/lib_microblaze/bootm.c
@@ -32,33 +32,13 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
-
-void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
-                    bootm_headers_t *images)
+int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 {
        /* First parameter is mapped to $r5 for kernel boot args */
        void    (*theKernel) (char *);
        char    *commandline = getenv ("bootargs");
-       ulong   ep = 0;
 
-       /* find kernel entry point */
-       if (images->legacy_hdr_valid) {
-               ep = image_get_ep (images->legacy_hdr_os);
-#if defined(CONFIG_FIT)
-       } else if (images->fit_uname_os) {
-               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");
-               goto error;
-       }
-       theKernel = (void (*)(char *))ep;
+       theKernel = (void (*)(char *))images->ep;
 
        show_boot_progress (15);
 
@@ -67,15 +47,8 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
                (ulong) theKernel);
 #endif
 
-       if (!images->autostart)
-               return ;
-
        theKernel (commandline);
        /* does not return */
-       return;
-
 error:
-       if (images->autostart)
-               do_reset (cmdtp, flag, argc, argv);
-       return;
+       return 1;
 }