Merge tag 'for-v2020.07' of https://gitlab.denx.de/u-boot/custodians/u-boot-i2c

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

diff --git a/cmd/cramfs.c b/cmd/cramfs.c
index 86f1bac272cce1a1e1033ca141f1bc86f349413c..ad232deae009c2b323b85f5a185a393da5316adf 100644 (file)
--- a/cmd/cramfs.c
+++ b/cmd/cramfs.c
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * SPDX-License-Identifier:    GPL-2.0+
  *
  * based on: cmd_jffs2.c
  *
@@ -12,6 +12,8 @@
  */
 #include <common.h>
 #include <command.h>
+#include <env.h>
+#include <image.h>
 #include <malloc.h>
 #include <mapmem.h>
 #include <linux/list.h>
@@ -96,7 +98,7 @@ int do_cramfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        char *filename;
        int size;
-       ulong offset = load_addr;
+       ulong offset = image_load_addr;
        char *offset_virt;
 
        struct part_info part;
@@ -126,7 +128,7 @@ int do_cramfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        }
        if (argc == 3) {
                offset = simple_strtoul(argv[1], NULL, 0);
-               load_addr = offset;
+               image_load_addr = offset;
                filename = argv[2];
        }