Merge branch 'next' of ../next

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

diff --git a/lib_nios2/bootm.c b/lib_nios2/bootm.c
index cb84324..675bfac 100644 (file)
--- a/lib_nios2/bootm.c
+++ b/lib_nios2/bootm.c
@@ -24,14 +24,24 @@
 #include <common.h>
 #include <command.h>
 #include <asm/byteorder.h>
+#include <asm/cache.h>
 
-void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
-               image_header_t *hdr, int verify)
+int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 {
-       void (*kernel)(void) = (void (*)(void))image_get_ep (hdr);
+       void (*kernel)(void) = (void (*)(void))images->ep;
+
+       if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
+               return 1;
+
+       /* flushes data and instruction caches before calling the kernel */
+       flush_dcache (0,CONFIG_SYS_DCACHE_SIZE);
+       flush_icache (0,CONFIG_SYS_ICACHE_SIZE);
 
        /* For now we assume the Microtronix linux ... which only
         * needs to be called ;-)
         */
        kernel ();
+       /* does not return */
+
+       return 1;
 }