rockchip: Remove ARCH= references from documentation

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

diff --git a/cmd/jffs2.c b/cmd/jffs2.c
index b47cd3d98930a4a80ee4fbdc55d4afaad036c795..9540988e33e5f06ca242b2f51bf9d572e160a921 100644 (file)
--- a/cmd/jffs2.c
+++ b/cmd/jffs2.c
@@ -73,8 +73,11 @@
 #include <common.h>
 #include <command.h>
 #include <env.h>
+#include <flash.h>
+#include <image.h>
 #include <malloc.h>
 #include <jffs2/jffs2.h>
+#include <linux/bug.h>
 #include <linux/list.h>
 #include <linux/ctype.h>
 #include <cramfs/cramfs_fs.h>
@@ -470,13 +473,14 @@ static struct part_info* jffs2_part_info(struct mtd_device *dev, unsigned int pa
  * @param argv arguments list
  * @return 0 on success, 1 otherwise
  */
-int do_jffs2_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_jffs2_fsload(struct cmd_tbl *cmdtp, int flag, int argc,
+                   char *const argv[])
 {
        char *fsname;
        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 +492,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];
        }
 
@@ -532,7 +536,7 @@ int do_jffs2_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
  * @param argv arguments list
  * @return 0 on success, 1 otherwise
  */
-int do_jffs2_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_jffs2_ls(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        char *filename = "/";
        int ret;
@@ -570,7 +574,8 @@ int do_jffs2_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
  * @param argv arguments list
  * @return 0 on success, 1 otherwise
  */
-int do_jffs2_fsinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_jffs2_fsinfo(struct cmd_tbl *cmdtp, int flag, int argc,
+                   char *const argv[])
 {
        struct part_info *part;
        char *fsname;