microblaze: clean microblaze_config.mk

[oweals/u-boot.git] / lib_arm / bootm.c

diff --git a/lib_arm/bootm.c b/lib_arm/bootm.c
index 77d35fcc656bc2b6eeeda8243afc67f47571c44d..c5e8cb3eb6625b821ce6b0b7a633fc68d5a0f9c7 100644 (file)
--- a/lib_arm/bootm.c
+++ b/lib_arm/bootm.c
@@ -70,6 +70,7 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
        char    *s;
        int     machid = bd->bi_arch_number;
        void    (*theKernel)(int zero, int arch, uint params);
+       int     ret;
 
 #ifdef CONFIG_CMDLINE_TAG
        char *commandline = getenv ("bootargs");
@@ -80,12 +81,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 ("ARM 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, int, uint))ep;
 
@@ -95,8 +100,10 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
                printf ("Using machid 0x%x from environment\n", machid);
        }
 
-       get_ramdisk (cmdtp, flag, argc, argv, images,
-                       IH_ARCH_ARM, &initrd_start, &initrd_end);
+       ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_ARM,
+                       &initrd_start, &initrd_end);
+       if (ret)
+               goto error;
 
        show_boot_progress (15);
 
@@ -149,6 +156,13 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
        cleanup_before_linux ();
 
        theKernel (0, machid, bd->bi_boot_params);
+       /* does not return */
+       return;
+
+error:
+       if (images->autostart)
+               do_reset (cmdtp, flag, argc, argv);
+       return;
 }