arm: mvebu: Introduce mvebu-u-boot.dtsi for 32-bit Armada SoCs

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

diff --git a/cmd/blk_common.c b/cmd/blk_common.c
index bf2f626..4e442f2 100644 (file)
--- a/cmd/blk_common.c
+++ b/cmd/blk_common.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Handling of common block commands
  *
@@ -5,15 +6,13 @@
  *
  * (C) Copyright 2000-2011
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <blk.h>
+#include <command.h>
 
-#ifdef HAVE_BLOCK_DEVICE
-int blk_common_cmd(int argc, char * const argv[], enum if_type if_type,
+int blk_common_cmd(int argc, char *const argv[], enum if_type if_type,
                   int *cur_devnump)
 {
        const char *if_name = blk_get_if_type_name(if_type);
@@ -34,13 +33,14 @@ int blk_common_cmd(int argc, char * const argv[], enum if_type if_type,
                        return 0;
                } else if (strncmp(argv[1], "part", 4) == 0) {
                        if (blk_list_part(if_type))
-                               printf("\nno %s devices available\n", if_name);
+                               printf("\nno %s partition table available\n",
+                                      if_name);
                        return 0;
                }
                return CMD_RET_USAGE;
        case 3:
                if (strncmp(argv[1], "dev", 3) == 0) {
-                       int dev = (int)simple_strtoul(argv[2], NULL, 10);
+                       int dev = (int)dectoul(argv[2], NULL);
 
                        if (!blk_show_device(if_type, dev)) {
                                *cur_devnump = dev;
@@ -50,7 +50,7 @@ int blk_common_cmd(int argc, char * const argv[], enum if_type if_type,
                        }
                        return 0;
                } else if (strncmp(argv[1], "part", 4) == 0) {
-                       int dev = (int)simple_strtoul(argv[2], NULL, 10);
+                       int dev = (int)dectoul(argv[2], NULL);
 
                        if (blk_print_part_devnum(if_type, dev)) {
                                printf("\n%s device %d not available\n",
@@ -63,9 +63,9 @@ int blk_common_cmd(int argc, char * const argv[], enum if_type if_type,
 
        default: /* at least 4 args */
                if (strcmp(argv[1], "read") == 0) {
-                       ulong addr = simple_strtoul(argv[2], NULL, 16);
-                       lbaint_t blk = simple_strtoul(argv[3], NULL, 16);
-                       ulong cnt = simple_strtoul(argv[4], NULL, 16);
+                       ulong addr = hextoul(argv[2], NULL);
+                       lbaint_t blk = hextoul(argv[3], NULL);
+                       ulong cnt = hextoul(argv[4], NULL);
                        ulong n;
 
                        printf("\n%s read: device %d block # "LBAFU", count %lu ... ",
@@ -78,9 +78,9 @@ int blk_common_cmd(int argc, char * const argv[], enum if_type if_type,
                               n == cnt ? "OK" : "ERROR");
                        return n == cnt ? 0 : 1;
                } else if (strcmp(argv[1], "write") == 0) {
-                       ulong addr = simple_strtoul(argv[2], NULL, 16);
-                       lbaint_t blk = simple_strtoul(argv[3], NULL, 16);
-                       ulong cnt = simple_strtoul(argv[4], NULL, 16);
+                       ulong addr = hextoul(argv[2], NULL);
+                       lbaint_t blk = hextoul(argv[3], NULL);
+                       ulong cnt = hextoul(argv[4], NULL);
                        ulong n;
 
                        printf("\n%s write: device %d block # "LBAFU", count %lu ... ",
@@ -97,4 +97,3 @@ int blk_common_cmd(int argc, char * const argv[], enum if_type if_type,
                }
        }
 }
-#endif