efi_loader: use logical and in do_env_print_efi()

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

diff --git a/cmd/zfs.c b/cmd/zfs.c
index 384ac4c9396cc288c5169aaac2210f49321849fd..9c237a5758d430e15f7d808de6851e2e5c7697c6 100644 (file)
--- a/cmd/zfs.c
+++ b/cmd/zfs.c
@@ -12,6 +12,7 @@
 #include <part.h>
 #include <config.h>
 #include <command.h>
+#include <env.h>
 #include <image.h>
 #include <linux/ctype.h>
 #include <asm/byteorder.h>
@@ -39,7 +40,6 @@ static int do_zfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
        ulong addr = 0;
        disk_partition_t info;
        struct blk_desc *dev_desc;
-       char buf[12];
        unsigned long count;
        const char *addr_str;
        struct zfs_file zfile;
@@ -111,7 +111,7 @@ static int do_zfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
        zfs_close(&zfile);
 
        /* Loading ok, update default load address */
-       load_addr = addr;
+       image_load_addr = addr;
 
        printf("%llu bytes read\n", zfile.size);
        env_set_hex("filesize", zfile.size);