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

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

diff --git a/lib_blackfin/bootm.c b/lib_blackfin/bootm.c
index 54f69a92c79a9e96fb82daedc6228f9c6e575780..9938ae5865adc4f040e74b6094fce1ba808ef4e6 100644 (file)
--- a/lib_blackfin/bootm.c
+++ b/lib_blackfin/bootm.c
@@ -14,8 +14,6 @@
 #include <image.h>
 #include <asm/blackfin.h>
 
-extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
-
 #ifdef SHARED_RESOURCES
 extern void swap_to(int device_id);
 #endif
@@ -33,34 +31,16 @@ static char *make_command_line(void)
        return dest;
 }
 
-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)
 {
        int     (*appl) (char *cmdline);
        char    *cmdline;
-       ulong   ep = 0;
 
 #ifdef SHARED_RESOURCES
        swap_to(FLASH);
 #endif
 
-       /* find kernel entry point */
-       if (images->legacy_hdr_valid) {
-               ep = image_get_ep (&images->legacy_hdr_os_copy);
-#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;
-       }
-       appl = (int (*)(char *))ep;
+       appl = (int (*)(char *))images->ep;
 
        printf("Starting Kernel at = %x\n", appl);
        cmdline = make_command_line();
@@ -68,8 +48,6 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
        dcache_disable();
        (*appl) (cmdline);
        /* does not return */
-       return;
 
- error:
-       do_reset (cmdtp, flag, argc, argv);
+       return 1;
 }