Merge patch series "Apply SoM overlays on phyCORE-AM6xx SoMs"

[J-u-boot.git] / cmd / io.c

diff --git a/cmd/io.c b/cmd/io.c
index 7fee9674a2862731c1e81f993ef88afd8745c04c..617373d3cb71052283915baa8de7ae1913e2cc74 100644 (file)
--- a/cmd/io.c
+++ b/cmd/io.c
@@ -7,8 +7,9 @@
  * IO space access commands.
  */
 
-#include <common.h>
 #include <command.h>
+#include <display_options.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 
 /* Display values from last command */
@@ -24,7 +25,7 @@ static ulong base_address;
  * Syntax:
  *     iod{.b, .w, .l} {addr}
  */
-int do_io_iod(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+int do_io_iod(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        ulong addr, length, bytes;
        u8 buf[DISP_LINE_LEN];
@@ -51,7 +52,7 @@ int do_io_iod(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
                        return 1;
 
                /* Address is specified since argc > 1 */
-               addr = simple_strtoul(argv[1], NULL, 16);
+               addr = hextoul(argv[1], NULL);
                addr += base_address;
 
                /*
@@ -59,7 +60,7 @@ int do_io_iod(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
                 * Length is the number of objects, not number of bytes.
                 */
                if (argc > 2)
-                       length = simple_strtoul(argv[2], NULL, 16);
+                       length = hextoul(argv[2], NULL);
        }
 
        bytes = size * length;
@@ -90,7 +91,7 @@ int do_io_iod(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
        return 0;
 }
 
-int do_io_iow(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+int do_io_iow(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        ulong addr, val;
        int size;
@@ -102,8 +103,8 @@ int do_io_iow(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
        if (size < 0)
                return 1;
 
-       addr = simple_strtoul(argv[1], NULL, 16);
-       val = simple_strtoul(argv[2], NULL, 16);
+       addr = hextoul(argv[1], NULL);
+       val = hextoul(argv[2], NULL);
 
        if (size == 4)
                outl((u32) val, addr);