diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2008-08-11 09:20:53 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-08-12 00:06:34 +0200 |
| commit | 3216ca9692ff80d7c638723ef448f3d36301d9e7 (patch) | |
| tree | ec5ea17d23963d05300ee3008009a738b0b62d17 /lib_sh/bootm.c | |
| parent | 3cf8a234b8e8c02e4da1f23566043bc288b05220 (diff) | |
| download | u-boot-imx-3216ca9692ff80d7c638723ef448f3d36301d9e7.zip u-boot-imx-3216ca9692ff80d7c638723ef448f3d36301d9e7.tar.gz u-boot-imx-3216ca9692ff80d7c638723ef448f3d36301d9e7.tar.bz2 | |
Fix fallout from autostart revert
The autostart revert caused a bit of duplicated code as well as
code that was using images->autostart that needs to get removed so
we can build again.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'lib_sh/bootm.c')
| -rw-r--r-- | lib_sh/bootm.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib_sh/bootm.c b/lib_sh/bootm.c index dd32a3e..4ee7ff3 100644 --- a/lib_sh/bootm.c +++ b/lib_sh/bootm.c @@ -83,9 +83,6 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], } void (*kernel) (void) = (void (*)(void))ep; - if (!images->autostart) - return ; - /* Setup parameters */ memset(PARAM, 0, 0x1000); /* Clear zero page */ strcpy(COMMAND_LINE, bootargs); @@ -95,7 +92,6 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], return; error: - if (images->autostart) - do_reset (cmdtp, flag, argc, argv); + do_reset (cmdtp, flag, argc, argv); return; } |