microblaze: Add cache flush

[platform/kernel/u-boot.git] / lib_microblaze / bootm.c

diff --git a/lib_microblaze/bootm.c b/lib_microblaze/bootm.c
index 5881df6..e97aae6 100644 (file)
--- a/lib_microblaze/bootm.c
+++ b/lib_microblaze/bootm.c
@@ -32,29 +32,16 @@
 
 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) {
-               fit_unsupported_reset ("MICROBLAZE linux bootm");
-               do_reset (cmdtp, flag, argc, argv);
-#endif
-       } else {
-               puts ("Could not find kernel entry point!\n");
-               do_reset (cmdtp, flag, argc, argv);
-       }
-       theKernel = (void (*)(char *))ep;
+       if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
+               return 1;
+
+       theKernel = (void (*)(char *))images->ep;
 
        show_boot_progress (15);
 
@@ -64,4 +51,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
 #endif
 
        theKernel (commandline);
+       /* does not return */
+
+       return 1;
 }