summaryrefslogtreecommitdiff
path: root/lib_ppc
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2008-08-11 09:20:53 -0500
committerWolfgang Denk <wd@denx.de>2008-08-12 00:06:34 +0200
commit3216ca9692ff80d7c638723ef448f3d36301d9e7 (patch)
treeec5ea17d23963d05300ee3008009a738b0b62d17 /lib_ppc
parent3cf8a234b8e8c02e4da1f23566043bc288b05220 (diff)
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_ppc')
-rw-r--r--lib_ppc/bootm.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c
index 81803ddef3d..cbe5592a948 100644
--- a/lib_ppc/bootm.c
+++ b/lib_ppc/bootm.c
@@ -277,8 +277,6 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
#if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500)
unlock_ram_in_cache();
#endif
- if (!images->autostart)
- return ;
#if defined(CONFIG_OF_LIBFDT)
if (of_flat_tree) { /* device tree; boot new style */
@@ -311,8 +309,7 @@ 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 ;
}