summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2013-07-10 23:08:11 -0700
committerTom Rini <trini@ti.com>2013-07-12 10:32:39 -0400
commitd72da1582895ca226b995758426ec3769b54a9b8 (patch)
tree351a2119ec259ae20e13fd0fe7e6f61dcb2423a4
parentf320a4d845ab160dd539888280b6452deebdb3d0 (diff)
downloadu-boot-d72da1582895ca226b995758426ec3769b54a9b8.tar.gz
u-boot-d72da1582895ca226b995758426ec3769b54a9b8.tar.xz
u-boot-d72da1582895ca226b995758426ec3769b54a9b8.zip
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>
-rw-r--r--common/cmd_elf.c6
1 files changed, 3 insertions, 3 deletions
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",