diff options
| author | Stefan Roese <sr@denx.de> | 2008-08-12 20:39:27 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-08-12 20:39:27 +0200 |
| commit | 9939ffd5fbf1f5aff4d8172531d4fc33797c62c8 (patch) | |
| tree | 40e9295368c82a9c7f2b09e7b1fb76c2c44df0ce /lib_m68k/bootm.c | |
| parent | 1c7015100a620582224f25eb057573a0fe147648 (diff) | |
| parent | cd82919e6c8a73b363a26f34b734923844e52d1c (diff) | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next
Diffstat (limited to 'lib_m68k/bootm.c')
| -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 ; } |