Merge tag 'u-boot-amlogic-20200428' of https://gitlab.denx.de/u-boot/custodians/u...

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

diff --git a/cmd/jffs2.c b/cmd/jffs2.c
index 13c533cf12992bc2532f90b668806a614ed19e7d..da2580d85d729dd9cfb579e05bf84e1dc2c938d5 100644 (file)
--- a/cmd/jffs2.c
+++ b/cmd/jffs2.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2002
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@ -17,8 +18,6 @@
  *
  *   $Id: cmdlinepart.c,v 1.17 2004/11/26 11:18:47 lavinen Exp $
  *   Copyright 2002 SYSGO Real-Time Solutions GmbH
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -73,6 +72,8 @@
  */
 #include <common.h>
 #include <command.h>
+#include <env.h>
+#include <image.h>
 #include <malloc.h>
 #include <jffs2/jffs2.h>
 #include <linux/list.h>
@@ -476,7 +477,7 @@ int do_jffs2_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        char *filename;
        int size;
        struct part_info *part;
-       ulong offset = load_addr;
+       ulong offset = image_load_addr;
 
        /* pre-set Boot file name */
        filename = env_get("bootfile");
@@ -488,7 +489,7 @@ int do_jffs2_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        }
        if (argc == 3) {
                offset = simple_strtoul(argv[1], NULL, 16);
-               load_addr = offset;
+               image_load_addr = offset;
                filename = argv[2];
        }