diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2008-02-27 21:51:51 -0600 |
|---|---|---|
| committer | Marian Balakowicz <m8@semihalf.com> | 2008-02-29 13:15:56 +0100 |
| commit | 75fa002c47171b73fb4c1f2c2fe4d6391c136276 (patch) | |
| tree | ccabb8e8cb7aaac6e3a1a40b046fe59d92832682 /lib_ppc | |
| parent | d3f2fa0d278467b2232e4eb2372f905c3febfbeb (diff) | |
| download | blackbird-obmc-uboot-75fa002c47171b73fb4c1f2c2fe4d6391c136276.tar.gz blackbird-obmc-uboot-75fa002c47171b73fb4c1f2c2fe4d6391c136276.zip | |
[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_ppc')
| -rw-r--r-- | lib_ppc/bootm.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c index 59cc2a4471..1afef46df7 100644 --- a/lib_ppc/bootm.c +++ b/lib_ppc/bootm.c @@ -242,6 +242,8 @@ 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 */ @@ -270,7 +272,8 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], return ; error: - do_reset (cmdtp, flag, argc, argv); + if (images->autostart) + do_reset (cmdtp, flag, argc, argv); return ; } |
