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

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>

diff --git a/common/cmd_elf.c b/common/cmd_elf.c
index 1d92bb37d3f9b4c1b435faa5b2651abcc7d88fb9..0e3d56f6bbb88ee0004f99f6ecb4b590bff59da7 100644 (file)
--- a/common/cmd_elf.c
+++ b/common/cmd_elf.c
@@ -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
  * 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 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 ((tmp = getenv ("loadaddr")) != NULL) {
-               addr = simple_strtoul (tmp, NULL, 16);
-       } else {
-               puts ("No load address provided\n");
-               return 1;
-       }
+       if (argc < 2)
+               addr = load_addr;
+       else
+               addr = simple_strtoul (argv[1], NULL, 16);
 
 #if (CONFIG_COMMANDS & CFG_CMD_NET)
        /* Check to see if we need to tftp the image ourselves before starting */