Kconfig: Convert CMD_READ to Kconfig

Convert this option and enable it in sandbox. Also correct a bug which
was introduced with the block-device driver model conversion.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

diff --git a/README b/README
index 98fc95a..fb5f471 100644 (file)
--- a/README
+++ b/README
@@ -814,7 +814,6 @@ The following options need to be configured:
                CONFIG_CMD_NFS            NFS support
                CONFIG_CMD_PING         * send ICMP ECHO_REQUEST to network
                                          host
-               CONFIG_CMD_READ         * Read raw data from partition
                CONFIG_CMD_REGINFO      * Register dump
                CONFIG_CMD_RUN            run command in env variable
                CONFIG_CMD_SANDBOX      * sb command to access sandbox features

diff --git a/cmd/Kconfig b/cmd/Kconfig
index ef614a6..0d9292b 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -749,6 +749,11 @@ config CMD_PCMCIA
          about 1990. These devices are typically removable memory or network
          cards using a standard 68-pin connector.
 
+config CMD_READ
+       bool "read - Read binary data from a partition"
+       help
+         Provides low-level access to the data in a partition.
+
 config CMD_REMOTEPROC
        bool "remoteproc"
        depends on REMOTEPROC

diff --git a/cmd/read.c b/cmd/read.c
index 61d8ce7..ecf9254 100644 (file)
--- a/cmd/read.c
+++ b/cmd/read.c
@@ -66,7 +66,7 @@ int do_read(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                return 1;
        }
 
-       if (blk_read(dev_desc, offset + blk, cnt, addr) < 0) {
+       if (blk_dread(dev_desc, offset + blk, cnt, addr) < 0) {
                printf("Error reading blocks\n");
                return 1;
        }

diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 3fe2702..a1844d3 100644 (file)
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -193,3 +193,6 @@ CONFIG_UNIT_TEST=y
 CONFIG_UT_TIME=y
 CONFIG_UT_DM=y
 CONFIG_UT_ENV=y
+CONFIG_CMD_MTDPARTS=y
+CONFIG_CMD_MTDPARTS_SPREAD=y
+CONFIG_CMD_READ=y

diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h
index 35a6a52..edfc91f 100644 (file)
--- a/include/config_cmd_all.h
+++ b/include/config_cmd_all.h
@@ -15,7 +15,6 @@
 
 #define CONFIG_CMD_REGINFO     /* Register dump                */
 #define CONFIG_CMD_REISER      /* Reiserfs support             */
-#define CONFIG_CMD_READ                /* Read data from partition     */
 #define CONFIG_CMD_SANDBOX     /* sb command to access sandbox features */
 #define CONFIG_CMD_SAVES       /* save S record dump           */
 #define CONFIG_CMD_SDRAM       /* SDRAM DIMM SPD info printout */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index fdfca1a..5ad5a3b 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -293,7 +293,6 @@ CONFIG_CM922T_XA10
 CONFIG_CMDLINE_EDITING
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_TAG
-CONFIG_CMD_READ
 CONFIG_CMD_REGINFO
 CONFIG_CMD_REISER
 CONFIG_CMD_SANDBOX