cmd: fdt: Map address returned from fdt get addr to sysmem

[platform/kernel/u-boot.git] / cmd / ubifs.c

diff --git a/cmd/ubifs.c b/cmd/ubifs.c
index 5e9d357..6a01d09 100644 (file)
--- a/cmd/ubifs.c
+++ b/cmd/ubifs.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2008
  * Stefan Roese, DENX Software Engineering, sr@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 
@@ -15,21 +14,16 @@
 #include <common.h>
 #include <config.h>
 #include <command.h>
+#include <log.h>
 #include <ubifs_uboot.h>
 
 static int ubifs_initialized;
 static int ubifs_mounted;
 
-static int do_ubifs_mount(cmd_tbl_t *cmdtp, int flag, int argc,
-                               char * const argv[])
+int cmd_ubifs_mount(char *vol_name)
 {
-       char *vol_name;
        int ret;
 
-       if (argc != 2)
-               return CMD_RET_USAGE;
-
-       vol_name = argv[1];
        debug("Using volume %s\n", vol_name);
 
        if (ubifs_initialized == 0) {
@@ -39,11 +33,24 @@ static int do_ubifs_mount(cmd_tbl_t *cmdtp, int flag, int argc,
 
        ret = uboot_ubifs_mount(vol_name);
        if (ret)
-               return -1;
+               return CMD_RET_FAILURE;
 
        ubifs_mounted = 1;
 
-       return 0;
+       return ret;
+}
+
+static int do_ubifs_mount(struct cmd_tbl *cmdtp, int flag, int argc,
+                         char *const argv[])
+{
+       char *vol_name;
+
+       if (argc != 2)
+               return CMD_RET_USAGE;
+
+       vol_name = argv[1];
+
+       return cmd_ubifs_mount(vol_name);
 }
 
 int ubifs_is_mounted(void)
@@ -51,38 +58,38 @@ int ubifs_is_mounted(void)
        return ubifs_mounted;
 }
 
-void cmd_ubifs_umount(void)
+int cmd_ubifs_umount(void)
 {
+       if (ubifs_initialized == 0) {
+               printf("No UBIFS volume mounted!\n");
+               return CMD_RET_FAILURE;
+       }
+
        uboot_ubifs_umount();
        ubifs_mounted = 0;
        ubifs_initialized = 0;
+
+       return 0;
 }
 
-static int do_ubifs_umount(cmd_tbl_t *cmdtp, int flag, int argc,
-                               char * const argv[])
+static int do_ubifs_umount(struct cmd_tbl *cmdtp, int flag, int argc,
+                          char *const argv[])
 {
        if (argc != 1)
                return CMD_RET_USAGE;
 
-       if (ubifs_initialized == 0) {
-               printf("No UBIFS volume mounted!\n");
-               return -1;
-       }
-
-       cmd_ubifs_umount();
-
-       return 0;
+       return cmd_ubifs_umount();
 }
 
-static int do_ubifs_ls(cmd_tbl_t *cmdtp, int flag, int argc,
-                       char * const argv[])
+static int do_ubifs_ls(struct cmd_tbl *cmdtp, int flag, int argc,
+                      char *const argv[])
 {
        char *filename = "/";
        int ret;
 
        if (!ubifs_mounted) {
                printf("UBIFS not mounted, use ubifsmount to mount volume first!\n");
-               return -1;
+               return CMD_RET_FAILURE;
        }
 
        if (argc == 2)
@@ -98,8 +105,8 @@ static int do_ubifs_ls(cmd_tbl_t *cmdtp, int flag, int argc,
        return ret;
 }
 
-static int do_ubifs_load(cmd_tbl_t *cmdtp, int flag, int argc,
-                               char * const argv[])
+static int do_ubifs_load(struct cmd_tbl *cmdtp, int flag, int argc,
+                        char *const argv[])
 {
        char *filename;
        char *endp;
@@ -109,20 +116,20 @@ static int do_ubifs_load(cmd_tbl_t *cmdtp, int flag, int argc,
 
        if (!ubifs_mounted) {
                printf("UBIFS not mounted, use ubifs mount to mount volume first!\n");
-               return -1;
+               return CMD_RET_FAILURE;
        }
 
        if (argc < 3)
                return CMD_RET_USAGE;
 
-       addr = simple_strtoul(argv[1], &endp, 16);
+       addr = hextoul(argv[1], &endp);
        if (endp == argv[1])
                return CMD_RET_USAGE;
 
        filename = argv[2];
 
        if (argc == 4) {
-               size = simple_strtoul(argv[3], &endp, 16);
+               size = hextoul(argv[3], &endp);
                if (endp == argv[3])
                        return CMD_RET_USAGE;
        }