From 3216ca9692ff80d7c638723ef448f3d36301d9e7 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Mon, 11 Aug 2008 09:20:53 -0500 Subject: 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 --- lib_m68k/bootm.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'lib_m68k') diff --git a/lib_m68k/bootm.c b/lib_m68k/bootm.c index 61f1a3648..b45203d17 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 ; } -- cgit v1.2.3