Patchwork [U-Boot,4/4] bootm: Correct the arguments for the ELF image loader

login
register
mail settings
Submitter Simon Glass
Date July 11, 2013, 6:08 a.m.
Message ID <1373522891-7677-5-git-send-email-sjg@chromium.org>
Download mbox | patch
Permalink /patch/258313/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

Simon Glass - July 11, 2013, 6:08 a.m.
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>
---
 common/cmd_elf.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Patch

diff --git a/common/cmd_elf.c b/common/cmd_elf.c
index ab9c7e3..f741f6b 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",