Skip to content
Snippets Groups Projects
Commit 07a1a0c9 authored by Stany MARCEL's avatar Stany MARCEL Committed by Tom Rini
Browse files

Correct vxWorks elf boot to load at correct address


argv[0] contains bootvx (command name) not the load address, if called with
argv < 2 use load_addr, else use address argument given to the command.

Signed-off-by: default avatarStany MARCEL <smarcel@novasys-ingenierie.com>
parent 93f70dfd
No related branches found
No related tags found
No related merge requests found
...@@ -156,16 +156,16 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) ...@@ -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 we don't know where the image is then we're done.
*/ */
if (argc < 1) if (argc < 2)
addr = load_addr; addr = load_addr;
else else
addr = simple_strtoul(argv[0], NULL, 16); addr = simple_strtoul(argv[1], NULL, 16);
#if defined(CONFIG_CMD_NET) #if defined(CONFIG_CMD_NET)
/* /*
* Check to see if we need to tftp the image ourselves before starting * 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) if (NetLoop(TFTPGET) <= 0)
return 1; return 1;
printf("Automatic boot of VxWorks image at address 0x%08lx ...\n", printf("Automatic boot of VxWorks image at address 0x%08lx ...\n",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment