diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2008-08-15 08:24:45 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-08-26 23:48:01 +0200 |
| commit | 40d7e99d374ba0a0a29cd1a8ba40d3b7c2c175c7 (patch) | |
| tree | aedac5a8fffc541a91f1948428c242291f9c7053 /lib_sh/bootm.c | |
| parent | 40afac22a9c602e55c501c800f1c064324711b56 (diff) | |
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>
Diffstat (limited to 'lib_sh/bootm.c')
| -rw-r--r-- | lib_sh/bootm.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lib_sh/bootm.c b/lib_sh/bootm.c index 9d2c908a546..e92c8483120 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; } |