global: Remove unused CONFIG defines

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

diff --git a/cmd/ini.c b/cmd/ini.c
index 8c28fa6..81dfc4c 100644 (file)
--- a/cmd/ini.c
+++ b/cmd/ini.c
@@ -13,7 +13,7 @@
 
 #include <common.h>
 #include <command.h>
-#include <environment.h>
+#include <env.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 
@@ -226,7 +226,7 @@ static int ini_handler(void *user, char *section, char *name, char *value)
        return 1;
 }
 
-static int do_ini(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_ini(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        const char *section;
        char *file_address;
@@ -236,10 +236,10 @@ static int do_ini(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                return CMD_RET_USAGE;
 
        section = argv[1];
-       file_address = (char *)simple_strtoul(
-               argc < 3 ? env_get("loadaddr") : argv[2], NULL, 16);
-       file_size = (size_t)simple_strtoul(
-               argc < 4 ? env_get("filesize") : argv[3], NULL, 16);
+       file_address = (char *)hextoul(argc < 3 ? env_get("loadaddr") : argv[2],
+                                       NULL);
+       file_size = (size_t)hextoul(argc < 4 ? env_get("filesize") : argv[3],
+                                    NULL);
 
        return ini_parse(file_address, file_size, ini_handler, (void *)section);
 }