mmc: zynq_sdhci: Use set_control_reg from sdhci.c

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

diff --git a/cmd/cramfs.c b/cmd/cramfs.c
index 1bc9875..44c0818 100644 (file)
--- a/cmd/cramfs.c
+++ b/cmd/cramfs.c
@@ -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>
@@ -93,7 +94,8 @@ extern int cramfs_info (struct part_info *info);
  * @param argv arguments list
  * @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 */
@@ -161,7 +163,7 @@ int do_cramfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
  * @param argv arguments list
  * @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 */