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_sparc/bootm.c | |
| parent | 1c7015100a620582224f25eb057573a0fe147648 (diff) | |
| parent | cd82919e6c8a73b363a26f34b734923844e52d1c (diff) | |
| download | u-boot-imx-9939ffd5fbf1f5aff4d8172531d4fc33797c62c8.zip u-boot-imx-9939ffd5fbf1f5aff4d8172531d4fc33797c62c8.tar.gz u-boot-imx-9939ffd5fbf1f5aff4d8172531d4fc33797c62c8.tar.bz2 | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next
Diffstat (limited to 'lib_sparc/bootm.c')
| -rw-r--r-- | lib_sparc/bootm.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib_sparc/bootm.c b/lib_sparc/bootm.c index 8900b2e..b1a3d98 100644 --- a/lib_sparc/bootm.c +++ b/lib_sparc/bootm.c @@ -204,9 +204,6 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[], bootargs = getenv("bootargs"); prepare_bootargs(bootargs); - if (!images->autostart) - return; - /* turn on mmu & setup context table & page table for process 0 (kernel) */ srmmu_init_cpu((unsigned int)kernel); @@ -220,7 +217,6 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[], while (1) ; error: - if (images->autostart) - do_reset(cmdtp, flag, argc, argv); + do_reset(cmdtp, flag, argc, argv); return; } |