summaryrefslogtreecommitdiffstats
path: root/lib_nios2
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_nios2
parent3cf8a234b8e8c02e4da1f23566043bc288b05220 (diff)
downloadblackbird-obmc-uboot-3216ca9692ff80d7c638723ef448f3d36301d9e7.tar.gz
blackbird-obmc-uboot-3216ca9692ff80d7c638723ef448f3d36301d9e7.zip
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_nios2')
-rw-r--r--lib_nios2/bootm.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib_nios2/bootm.c b/lib_nios2/bootm.c
index 01f4e87cb4..18cf7736ef 100644
--- a/lib_nios2/bootm.c
+++ b/lib_nios2/bootm.c
@@ -50,9 +50,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 ;
-
/* For now we assume the Microtronix linux ... which only
* needs to be called ;-)
*/
@@ -61,7 +58,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;
}
OpenPOWER on IntegriCloud