X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=common%2Fcmd_elf.c;h=22475dc3cbff63247609f9acdc5f802d6380f7bd;hb=3e4dad50320d20894710276eb09f2057c6985065;hp=58b61c26403b9fe79fe041c7c6cf2b6123309759;hpb=dee332ffb735f65ab922118791a583c17bb0b795;p=u-boot

diff --git a/common/cmd_elf.c b/common/cmd_elf.c
index 58b61c2640..22475dc3cb 100644
--- a/common/cmd_elf.c
+++ b/common/cmd_elf.c
@@ -95,6 +95,7 @@ int do_bootelf(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	unsigned long addr;		/* Address of the ELF image     */
 	unsigned long rc;		/* Return value from user code  */
 	char *sload, *saddr;
+	const char *ep = getenv("autostart");
 
 	/* -------------------------------------------------- */
 	int rcode = 0;
@@ -123,6 +124,9 @@ int do_bootelf(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	else
 		addr = load_elf_image_shdr(addr);
 
+	if (ep && !strcmp(ep, "no"))
+		return rcode;
+
 	printf("## Starting application at 0x%08lx ...\n", addr);
 
 	/*
@@ -166,7 +170,7 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	 * Check to see if we need to tftp the image ourselves before starting
 	 */
 	if ((argc == 2) && (strcmp(argv[1], "tftp") == 0)) {
-		if (NetLoop(TFTPGET) <= 0)
+		if (net_loop(TFTPGET) <= 0)
 			return 1;
 		printf("Automatic boot of VxWorks image at address 0x%08lx ...\n",
 			addr);