From b75dfd2d4675e660ab20806641a063cdb65e99a0 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 4 Aug 2017 16:34:39 -0600 Subject: [PATCH] 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 Reviewed-by: Bin Meng Reviewed-by: Philipp Tomsich --- README | 1 - cmd/Kconfig | 5 +++++ cmd/read.c | 2 +- configs/sandbox_defconfig | 3 +++ include/config_cmd_all.h | 1 - scripts/config_whitelist.txt | 1 - 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/README b/README index 98fc95a915..fb5f47166d 100644 --- 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 ef614a6a5f..0d9292b4f6 100644 --- 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 61d8ce73e4..ecf925426f 100644 --- 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 3fe2702d30..a1844d30a2 100644 --- 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 35a6a529eb..edfc91ff9b 100644 --- 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 fdfca1a370..5ad5a3b1a4 100644 --- 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 -- 2.25.1