Merge branch 'Makefile' of git://git.denx.de/u-boot-arm

[u-boot] / lib_m68k / bootm.c

diff --git a/lib_m68k/bootm.c b/lib_m68k/bootm.c
index fba7499090d2dc319a2ccd89cace42a2d2a369e9..6504cc9174cee48e2f861d8127119a1b7138b7c5 100644 (file)
--- a/lib_m68k/bootm.c
+++ b/lib_m68k/bootm.c
@@ -35,8 +35,6 @@
 
 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
@@ -44,24 +42,20 @@ extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 
 static ulong get_sp (void);
 static void set_clocks_in_mhz (bd_t *kbd);
-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)
 {
        ulong sp;
 
-       ulong rd_data_start, rd_data_end, rd_len;
+       ulong rd_len;
        ulong initrd_start, initrd_end;
        int ret;
 
        ulong cmd_start, cmd_end;
        ulong bootmap_base;
        bd_t  *kbd;
-       ulong ep = 0;
        void  (*kernel) (bd_t *, ulong, ulong, ulong, ulong);
-       struct lmb *lmb = images->lmb;
+       struct lmb *lmb = &images->lmb;
 
        bootmap_base = getenv_bootm_low();
 
@@ -96,29 +90,10 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag,
        }
        set_clocks_in_mhz(kbd);
 
-       /* 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) {
-               fit_unsupported_reset ("M68K linux bootm");
-               do_reset (cmdtp, flag, argc, argv);
-#endif
-       } else {
-               puts ("Could not find kernel entry point!\n");
-               do_reset (cmdtp, flag, argc, argv);
-       }
-       kernel = (void (*)(bd_t *, ulong, ulong, ulong, ulong))ep;
-
-       /* find ramdisk */
-       ret = boot_get_ramdisk (cmdtp, flag, argc, argv, images,
-                       IH_ARCH_M68K, &rd_data_start, &rd_data_end);
+       kernel = (void (*)(bd_t *, ulong, ulong, ulong, ulong))images->ep;
 
-       if (ret)
-               goto error;
-
-       rd_len = rd_data_end - rd_data_start;
-       ret = boot_ramdisk_high (lmb, rd_data_start, rd_len,
+       rd_len = images->rd_end - images->rd_start;
+       ret = boot_ramdisk_high (lmb, images->rd_start, rd_len,
                        &initrd_start, &initrd_end);
        if (ret)
                goto error;
@@ -128,8 +103,6 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag,
 
        show_boot_progress (15);
 
-       if (!images->autostart)
-               return;
        /*
         * Linux Kernel Parameters (passing board info data):
         *   r3: ptr to board info data
@@ -140,12 +113,8 @@ 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:
-       if (images->autostart)
-               do_reset (cmdtp, flag, argc, argv);
-       return ;
+       return 1;
 }
 
 static ulong get_sp (void)