summaryrefslogtreecommitdiff
path: root/lib_avr32
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_avr32
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_avr32')
-rw-r--r--lib_avr32/bootm.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib_avr32/bootm.c b/lib_avr32/bootm.c
index 5ff8c79e9b5..60e6b363692 100644
--- a/lib_avr32/bootm.c
+++ b/lib_avr32/bootm.c
@@ -221,9 +221,6 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
params = setup_ethernet_tags(params);
setup_end_tag(params);
- if (!images->autostart)
- return ;
-
printf("\nStarting kernel at %p (params at %p)...\n\n",
theKernel, params_start);
@@ -234,7 +231,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;
}