diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2008-08-11 09:20:53 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-08-12 00:06:34 +0200 |
| commit | 3216ca9692ff80d7c638723ef448f3d36301d9e7 (patch) | |
| tree | ec5ea17d23963d05300ee3008009a738b0b62d17 /lib_m68k | |
| parent | 3cf8a234b8e8c02e4da1f23566043bc288b05220 (diff) | |
| download | talos-obmc-uboot-3216ca9692ff80d7c638723ef448f3d36301d9e7.tar.gz talos-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_m68k')
| -rw-r--r-- | lib_m68k/bootm.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib_m68k/bootm.c b/lib_m68k/bootm.c index 61f1a3648a..b45203d170 100644 --- a/lib_m68k/bootm.c +++ b/lib_m68k/bootm.c @@ -129,8 +129,6 @@ 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 @@ -144,8 +142,7 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag, return ; error: - if (images->autostart) - do_reset (cmdtp, flag, argc, argv); + do_reset (cmdtp, flag, argc, argv); return ; } |
