diff options
| author | Stefan Roese <sr@denx.de> | 2008-08-12 20:39:27 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-08-12 20:39:27 +0200 |
| commit | 9939ffd5fbf1f5aff4d8172531d4fc33797c62c8 (patch) | |
| tree | 40e9295368c82a9c7f2b09e7b1fb76c2c44df0ce /lib_sh/bootm.c | |
| parent | 1c7015100a620582224f25eb057573a0fe147648 (diff) | |
| parent | cd82919e6c8a73b363a26f34b734923844e52d1c (diff) | |
| download | olio-uboot-2014.01-9939ffd5fbf1f5aff4d8172531d4fc33797c62c8.tar.xz olio-uboot-2014.01-9939ffd5fbf1f5aff4d8172531d4fc33797c62c8.zip | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next
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 dd32a3ed8..4ee7ff3fd 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; } |