diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_bootm.c | 9 | 
1 files changed, 7 insertions, 2 deletions
| diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index f3f960393..8b32f1cef 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -287,12 +287,17 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])  	switch (hdr->ih_type) {  	case IH_TYPE_STANDALONE: -		appl = (int (*)(cmd_tbl_t *, int, int, char *[]))ntohl(hdr->ih_ep);  		if (iflag)  			enable_interrupts(); +		/* load (and uncompress), but don't start if "autostart" +		 * is set to "no" +		 */ +		if (((s = getenv("autostart")) != NULL) && (strcmp(s,"no") == 0)) +			return 0; +		appl = (int (*)(cmd_tbl_t *, int, int, char *[]))ntohl(hdr->ih_ep);  		(*appl)(cmdtp, flag, argc-1, &argv[1]); -		break; +		return 0;  	case IH_TYPE_KERNEL:  	case IH_TYPE_MULTI:  		/* handled below */ |