bootm: refactor do_reset and os boot function args
There is no need for each OS specific function to call do_reset() we
can just do it once in bootm. This means its feasible on an error for
the OS boot function to return.
Also, remove passing in cmd_tbl_t as its not needed by the OS boot
functions. flag isn't currently used but might be in the future so
we left it alone.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
diff --git a/lib_arm/bootm.c b/lib_arm/bootm.c
index f9f702f..6c2f37e 100644
--- a/lib_arm/bootm.c
+++ b/lib_arm/bootm.c
@@ -56,10 +56,7 @@
static struct tag *params;
#endif /* CONFIG_SETUP_MEMORY_TAGS || CONFIG_CMDLINE_TAG || CONFIG_INITRD_TAG */
-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)
{
bd_t *bd = gd->bd;
char *s;
@@ -128,11 +125,8 @@
theKernel (0, machid, bd->bi_boot_params);
/* does not return */
- return;
-
error:
- do_reset (cmdtp, flag, argc, argv);
- return;
+ return 1;
}