From 40d7e99d374ba0a0a29cd1a8ba40d3b7c2c175c7 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Fri, 15 Aug 2008 08:24:45 -0500 Subject: 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 --- lib_sh/bootm.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'lib_sh') diff --git a/lib_sh/bootm.c b/lib_sh/bootm.c index 9d2c908a5..e92c84831 100644 --- a/lib_sh/bootm.c +++ b/lib_sh/bootm.c @@ -43,8 +43,6 @@ #define RAMDISK_IMAGE_START_MASK 0x07FF -extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); - #ifdef CFG_DEBUG static void hexdump (unsigned char *buf, int len) { @@ -59,8 +57,7 @@ static void hexdump (unsigned char *buf, int len) } #endif -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) { char *bootargs = getenv("bootargs"); @@ -72,9 +69,7 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], kernel(); /* does not return */ - return; error: - do_reset (cmdtp, flag, argc, argv); - return; + return 1; } -- cgit v1.2.3