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_m68k | |
| parent | d3f2fa0d278467b2232e4eb2372f905c3febfbeb (diff) | |
| download | talos-obmc-uboot-75fa002c47171b73fb4c1f2c2fe4d6391c136276.tar.gz talos-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_m68k')
| -rw-r--r-- | lib_m68k/bootm.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib_m68k/bootm.c b/lib_m68k/bootm.c index eca044ecea..e12d1d4aad 100644 --- a/lib_m68k/bootm.c +++ b/lib_m68k/bootm.c @@ -127,6 +127,8 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag, show_boot_progress (15); + if (!images->autostart) + return; /* * Linux Kernel Parameters (passing board info data): * r3: ptr to board info data @@ -140,7 +142,8 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag, return ; error: - do_reset (cmdtp, flag, argc, argv); + if (images->autostart) + do_reset (cmdtp, flag, argc, argv); return ; } |
