X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cmd%2Felf.c;h=57736f997bf856f0a49d62c9f8383ec8b86f8bba;hb=bb872dd930ccc0fb7a91c1b8e34b39ce2e9fed06;hp=d883be41931deea96e5a2be3fac3fb7ce4614ae6;hpb=957f51e86367e14be9e40cfe5cc3a494fc17abcf;p=oweals%2Fu-boot.git

diff --git a/cmd/elf.c b/cmd/elf.c
index d883be4193..57736f997b 100644
--- 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);