diff options
| author | Marian Balakowicz <m8@semihalf.com> | 2008-03-12 10:14:57 +0100 |
|---|---|---|
| committer | Marian Balakowicz <m8@semihalf.com> | 2008-03-12 10:14:57 +0100 |
| commit | a44a269a905f924b420020506a4d7d7eedcc0eaf (patch) | |
| tree | 0037b08fdd890a7c4b04a5e7beeb1daa88b45971 /common/cmd_bootm.c | |
| parent | d985c8498c4e47095820da97aa722381d39172c5 (diff) | |
[new uImage] Re-enable interrupts for non automatic booting
Re-enable interrupts if we return from do_bootm_<os> and 'autostart'
environment variable is not set to 'yes'.
Signed-off-by: Marian Balakowicz <m8@semihalf.com>
Diffstat (limited to 'common/cmd_bootm.c')
| -rw-r--r-- | common/cmd_bootm.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 96d09e68d..aca54b5a5 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -342,8 +342,12 @@ 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"); - do_reset (cmdtp, flag, argc, argv); + if (images.autostart) + do_reset (cmdtp, flag, argc, argv); #endif + if (!images.autostart && iflag) + enable_interrupts(); + return 1; } |