[new uImage] rework error handling so common functions don't reset

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

diff --git a/lib_m68k/bootm.c b/lib_m68k/bootm.c
index 74240af554f3fb5c2515fde465f7b8623ab5c9cf..c9d2a27155e2925792c4f18e27239dc7dab740c7 100644 (file)
--- a/lib_m68k/bootm.c
+++ b/lib_m68k/bootm.c
@@ -35,6 +35,8 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
+
 #define PHYSADDR(x) x
 
 #define LINUX_MAX_ENVS         256
@@ -52,6 +54,7 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag,
 
        ulong rd_data_start, rd_data_end, rd_len;
        ulong initrd_start, initrd_end;
+       int ret;
 
        ulong cmd_start, cmd_end;
        bd_t  *kbd;
@@ -95,9 +98,12 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag,
        kernel = (void (*)(bd_t *, ulong, ulong, ulong, ulong))ep;
 
        /* find ramdisk */
-       get_ramdisk (cmdtp, flag, argc, argv, images,
+       ret = get_ramdisk (cmdtp, flag, argc, argv, images,
                        IH_ARCH_M68K, &rd_data_start, &rd_data_end);
 
+       if (ret)
+               goto error;
+
        rd_len = rd_data_end - rd_data_start;
        alloc_current = ramdisk_high (alloc_current, rd_data_start, rd_len,
                        sp_limit, get_sp (), &initrd_start, &initrd_end);
@@ -117,6 +123,11 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag,
         */
        (*kernel) (kbd, initrd_start, initrd_end, cmd_start, cmd_end);
        /* does not return */
+       return ;
+
+error:
+       do_reset (cmdtp, flag, argc, argv);
+       return ;
 }
 
 static ulong get_sp (void)