GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 14:41:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[PATCH] common/cmd_elf.c: Enable loadaddr as parameter in bootvx command

Browse source 
In the bootvx command the load address was only read from the env
variable "loadaddr" and not optionally passed as paramter as described
in the help. This is fixed with this patch. The behaviour is now the
same as in the bootelf command.

Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Stefan Roese 2006-11-29 12:53:15 +01:00
parent 4e26f1074c
commit 1bdd46832a
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
common/cmd_elf.c
View file

@ -79,7 +79,7 @@ int do_bootelf (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
* be either an ELF image or a raw binary. Will attempt to setup the * be either an ELF image or a raw binary. Will attempt to setup the
* bootline and other parameters correctly. * bootline and other parameters correctly.
* ====================================================================== */ * ====================================================================== */
int do_bootvx ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{ {
unsigned long addr; /* Address of image */ unsigned long addr; /* Address of image */
unsigned long bootaddr; /* Address to put the bootline */ unsigned long bootaddr; /* Address to put the bootline */
@ -96,12 +96,10 @@ int do_bootvx ( cmd_tbl_t *cmdtp, int flag, int argc, char *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 ((tmp = getenv ("loadaddr")) != NULL) { if (argc < 2)
addr = simple_strtoul (tmp, NULL, 16); addr = load_addr;
} else { else
puts ("No load address provided\n"); addr = simple_strtoul (argv[1], NULL, 16);
return 1;
}
#if (CONFIG_COMMANDS & CFG_CMD_NET) #if (CONFIG_COMMANDS & CFG_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 */