summaryrefslogtreecommitdiff
path: root/lib_nios2/bootm.c
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2008-02-27 21:51:51 -0600
committerMarian Balakowicz <m8@semihalf.com>2008-02-29 13:15:56 +0100
commit75fa002c47171b73fb4c1f2c2fe4d6391c136276 (patch)
treeccabb8e8cb7aaac6e3a1a40b046fe59d92832682 /lib_nios2/bootm.c
parentd3f2fa0d278467b2232e4eb2372f905c3febfbeb (diff)
[new uImage] Respect autostart setting in linux bootm
Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: Marian Balakowicz <m8@semihalf.com>
Diffstat (limited to 'lib_nios2/bootm.c')
-rw-r--r--lib_nios2/bootm.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib_nios2/bootm.c b/lib_nios2/bootm.c
index 70d2bb0769..4b940cb619 100644
--- a/lib_nios2/bootm.c
+++ b/lib_nios2/bootm.c
@@ -46,6 +46,9 @@ 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 ;-)
*/