Coding Style cleanup; update CHANGELOG.

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

diff --git a/lib_nios2/bootm.c b/lib_nios2/bootm.c
index 4b940cb6195108b0ccfb6b379d7044d859680018..53fd5691ad7dd9c288d0b252fa061db0f99edd6b 100644 (file)
--- a/lib_nios2/bootm.c
+++ b/lib_nios2/bootm.c
@@ -25,32 +25,18 @@
 #include <command.h>
 #include <asm/byteorder.h>
 
-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   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 ("NIOS2 linux bootm");
-               do_reset (cmdtp, flag, argc, argv);
-#endif
-       } else {
-               puts ("Could not find kernel entry point!\n");
-               do_reset (cmdtp, flag, argc, argv);
-       }
-       void (*kernel)(void) = (void (*)(void))ep;
+       void (*kernel)(void) = (void (*)(void))images->ep;
 
-       if (!images->autostart)
-               return ;
+       if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
+               return 1;
 
        /* For now we assume the Microtronix linux ... which only
         * needs to be called ;-)
         */
        kernel ();
+       /* does not return */
+
+       return 1;
 }