image: Rename load_addr, save_addr, save_size

[oweals/u-boot.git] / cmd / elf.c

diff --git a/cmd/elf.c b/cmd/elf.c
index d883be41931deea96e5a2be3fac3fb7ce4614ae6..57736f997bf856f0a49d62c9f8383ec8b86f8bba 100644 (file)
--- a/cmd/elf.c
+++ b/cmd/elf.c
@@ -15,8 +15,9 @@
 
 #include <common.h>
 #include <command.h>
+#include <cpu_func.h>
 #include <elf.h>
-#include <environment.h>
+#include <env.h>
 #include <net.h>
 #include <vxworks.h>
 #ifdef CONFIG_X86
@@ -293,7 +294,7 @@ int do_bootelf(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                /* Consume address */
                argc--; argv++;
        } else
-               addr = load_addr;
+               addr = image_load_addr;
 
        if (!valid_elf_image(addr))
                return 1;
@@ -347,7 +348,7 @@ 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)
-               addr = load_addr;
+               addr = image_load_addr;
        else
                addr = simple_strtoul(argv[1], NULL, 16);