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_mips | |
| parent | 40afac22a9c602e55c501c800f1c064324711b56 (diff) | |
| download | u-boot-imx-40d7e99d374ba0a0a29cd1a8ba40d3b7c2c175c7.zip u-boot-imx-40d7e99d374ba0a0a29cd1a8ba40d3b7c2c175c7.tar.gz u-boot-imx-40d7e99d374ba0a0a29cd1a8ba40d3b7c2c175c7.tar.bz2 | |
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_mips')
| -rw-r--r-- | lib_mips/bootm.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/lib_mips/bootm.c b/lib_mips/bootm.c index 9869c33..c1bf21e 100644 --- a/lib_mips/bootm.c +++ b/lib_mips/bootm.c @@ -43,15 +43,11 @@ static int linux_env_idx; static void linux_params_init (ulong start, char * commandline); static void linux_env_set (char * env_name, char * env_val); -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) { void (*theKernel) (int, char **, char **, int *); char *commandline = getenv ("bootargs"); char env_buf[12]; - int ret; char *cp; /* find kernel entry point */ @@ -103,11 +99,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[], theKernel (linux_argc, linux_argv, linux_env, 0); /* does not return */ - return; - -error: - do_reset (cmdtp, flag, argc, argv); - return; + return 1; } static void linux_params_init (ulong start, char *line) |