Merge branch '2022-08-04-Kconfig-migrations'

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

diff --git a/cmd/cramfs.c b/cmd/cramfs.c
index 1bc9875..57e2afa 100644 (file)
--- a/cmd/cramfs.c
+++ b/cmd/cramfs.c
@@ -3,7 +3,7 @@
  *
  * based on: cmd_jffs2.c
  *
- *     Add support for a CRAMFS located in RAM
+ *     Add support for a CRAMFS located in RAM
  */
 
 
@@ -13,6 +13,7 @@
 #include <common.h>
 #include <command.h>
 #include <env.h>
+#include <image.h>
 #include <malloc.h>
 #include <mapmem.h>
 #include <linux/list.h>
@@ -32,11 +33,11 @@
 # define DEBUGF(fmt, args...)
 #endif
 
-#include <flash.h>
 
 #ifndef CONFIG_MTD_NOR_FLASH
 # define OFFSET_ADJUSTMENT     0
 #else
+#include <flash.h>
 # define OFFSET_ADJUSTMENT     (flash_info[id.num].start[0])
 #endif
 
@@ -91,9 +92,10 @@ extern int cramfs_info (struct part_info *info);
  * @param flag command flag
  * @param argc number of arguments supplied to the command
  * @param argv arguments list
- * @return 0 on success, 1 otherwise
+ * Return: 0 on success, 1 otherwise
  */
-int do_cramfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_cramfs_load(struct cmd_tbl *cmdtp, int flag, int argc,
+                  char *const argv[])
 {
        char *filename;
        int size;
@@ -105,7 +107,7 @@ int do_cramfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        struct mtdids id;
 
        ulong addr;
-       addr = simple_strtoul(env_get("cramfsaddr"), NULL, 16);
+       addr = hextoul(env_get("cramfsaddr"), NULL);
 
        /* hack! */
        /* cramfs_* only supports NOR flash chips */
@@ -159,9 +161,9 @@ int do_cramfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
  * @param flag command flag
  * @param argc number of arguments supplied to the command
  * @param argv arguments list
- * @return 0 on success, 1 otherwise
+ * Return: 0 on success, 1 otherwise
  */
-int do_cramfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_cramfs_ls(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        char *filename = "/";
        int ret;
@@ -170,7 +172,7 @@ int do_cramfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        struct mtdids id;
 
        ulong addr;
-       addr = simple_strtoul(env_get("cramfsaddr"), NULL, 16);
+       addr = hextoul(env_get("cramfsaddr"), NULL);
 
        /* hack! */
        /* cramfs_* only supports NOR flash chips */