diff options
| author | Stefano Babic <sbabic@denx.de> | 2014-01-26 12:11:54 +0100 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-01-26 12:11:54 +0100 |
| commit | 707acd01ded3c60a4e277f7c5432d397897b4dfd (patch) | |
| tree | 5730e1e1f0bac6c1aeddc261cb412fc3d5f220fd /common/cmd_elf.c | |
| parent | be2a3bb39adf1fdd274fc427e30ef62eb86441a1 (diff) | |
| parent | c71b4dd2da0dcddabd7c29e6c3dc8a495d4bd928 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'common/cmd_elf.c')
| -rw-r--r-- | common/cmd_elf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/cmd_elf.c b/common/cmd_elf.c index f741f6b83f..ab9c7e332d 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 < 1) + if (argc < 2) addr = load_addr; else - addr = simple_strtoul(argv[0], NULL, 16); + addr = simple_strtoul(argv[1], NULL, 16); #if defined(CONFIG_CMD_NET) /* * Check to see if we need to tftp the image ourselves before starting */ - if ((argc == 1) && (strcmp(argv[0], "tftp") == 0)) { + if ((argc == 2) && (strcmp(argv[1], "tftp") == 0)) { if (NetLoop(TFTPGET) <= 0) return 1; printf("Automatic boot of VxWorks image at address 0x%08lx ...\n", |