summaryrefslogtreecommitdiff
path: root/lib_i386/bootm.c
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_i386/bootm.c
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_i386/bootm.c')
-rw-r--r--lib_i386/bootm.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib_i386/bootm.c b/lib_i386/bootm.c
index d959107c73b..452eef73bda 100644
--- a/lib_i386/bootm.c
+++ b/lib_i386/bootm.c
@@ -84,9 +84,6 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
}
- if (!images->autostart)
- return ;
-
#ifdef DEBUG
printf ("## Transferring control to Linux (at address %08x) ...\n",
(u32)base_ptr);
@@ -100,7 +97,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;
}