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 /common/cmd_bootm.c | |
| parent | 3cf8a234b8e8c02e4da1f23566043bc288b05220 (diff) | |
| download | olio-uboot-2014.01-3216ca9692ff80d7c638723ef448f3d36301d9e7.tar.xz olio-uboot-2014.01-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 'common/cmd_bootm.c')
| -rw-r--r-- | common/cmd_bootm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 2dffdfac8..529596926 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -361,10 +361,9 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) show_boot_progress (-9); #ifdef DEBUG puts ("\n## Control returned to monitor - resetting...\n"); - if (images.autostart) - do_reset (cmdtp, flag, argc, argv); + do_reset (cmdtp, flag, argc, argv); #endif - if (!images.autostart && iflag) + if (iflag) enable_interrupts(); return 1; |