From: Simon Glass <sjg@chromium.org>
Date: Thu, 11 Jul 2013 06:08:11 +0000 (-0700)
Subject: bootm: Correct the arguments for the ELF image loader
X-Git-Tag: v2013.07-rc3~5
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d72da1582895ca226b995758426ec3769b54a9b8;p=u-boot

bootm: Correct the arguments for the ELF image loader

The arguments were out of place since commit 983c72f, since this file was
missed and not tested. Correct this.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/common/cmd_elf.c b/common/cmd_elf.c
index ab9c7e332d..f741f6b83f 100644
--- a/common/cmd_elf.c
+++ b/common/cmd_elf.c
@@ -156,16 +156,16 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	 * If we don't know where the image is then we're done.
 	 */
 
-	if (argc < 2)
+	if (argc < 1)
 		addr = load_addr;
 	else
-		addr = simple_strtoul(argv[1], NULL, 16);
+		addr = simple_strtoul(argv[0], NULL, 16);
 
 #if defined(CONFIG_CMD_NET)
 	/*
 	 * Check to see if we need to tftp the image ourselves before starting
 	 */
-	if ((argc == 2) && (strcmp(argv[1], "tftp") == 0)) {
+	if ((argc == 1) && (strcmp(argv[0], "tftp") == 0)) {
 		if (NetLoop(TFTPGET) <= 0)
 			return 1;
 		printf("Automatic boot of VxWorks image at address 0x%08lx ...\n",