Re: [PATCH v2 2/5] cmd: introduce 'write' command

[Simon Glass]

On Wed, 1 Mar 2023 at 14:13, Rasmus Villemoes
 wrote:
>
> It's almost no extra code to hook up a buddy to the 'read' command. In
> fact, since the command is passed its own 'struct cmd_tbl', we can use
> the exact same callback, and let it figure out for itself whether it
> was invoked as "read" or "write".
>
> Signed-off-by: Rasmus Villemoes 
> ---
>  cmd/Kconfig  |  5 +
>  cmd/Makefile |  1 +
>  cmd/read.c   | 29 ++---
>  3 files changed, 28 insertions(+), 7 deletions(-)
>

Reviewed-by: Simon Glass 

[PATCH v2 2/5] cmd: introduce 'write' command

[Rasmus Villemoes]

It's almost no extra code to hook up a buddy to the 'read' command. In
fact, since the command is passed its own 'struct cmd_tbl', we can use
the exact same callback, and let it figure out for itself whether it
was invoked as "read" or "write".

Signed-off-by: Rasmus Villemoes 
---
 cmd/Kconfig  |  5 +
 cmd/Makefile |  1 +
 cmd/read.c   | 29 ++---
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 2caa4af71c..008ae55e02 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1562,6 +1562,11 @@ config CMD_WDT
help
  This provides commands to control the watchdog timer devices.
 
+config CMD_WRITE
+   bool "write - Write binary data to a partition"
+   help
+ Provides low-level write access to a partition.
+
 config CMD_AXI
bool "axi"
depends on AXI
diff --git a/cmd/Makefile b/cmd/Makefile
index 36d2daf22a..f2429c18ab 100644
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -140,6 +140,7 @@ obj-$(CONFIG_CMD_PXE) += pxe.o
 obj-$(CONFIG_CMD_WOL) += wol.o
 obj-$(CONFIG_CMD_QFW) += qfw.o
 obj-$(CONFIG_CMD_READ) += read.o
+obj-$(CONFIG_CMD_WRITE) += read.o
 obj-$(CONFIG_CMD_REGINFO) += reginfo.o
 obj-$(CONFIG_CMD_REISER) += reiser.o
 obj-$(CONFIG_CMD_REMOTEPROC) += remoteproc.o
diff --git a/cmd/read.c b/cmd/read.c
index 8645db49bb..1218e7acfd 100644
--- a/cmd/read.c
+++ b/cmd/read.c
@@ -13,14 +13,14 @@
 #include 
 #include 
 
-int do_read(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
+static int
+do_rw(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
struct blk_desc *dev_desc = NULL;
struct disk_partition part_info;
ulong offset, limit;
+   uint blk, cnt, res;
void *addr;
-   uint blk;
-   uint cnt;
int part;
 
if (argc != 6) {
@@ -47,20 +47,35 @@ int do_read(struct cmd_tbl *cmdtp, int flag, int argc, char 
*const argv[])
}
 
if (cnt + blk > limit) {
-   printf("Read out of range\n");
+   printf("%s out of range\n", cmdtp->name);
return 1;
}
 
-   if (blk_dread(dev_desc, offset + blk, cnt, addr) != cnt) {
-   printf("Error reading blocks\n");
+   if (IS_ENABLED(CONFIG_CMD_WRITE) && !strcmp(cmdtp->name, "write"))
+   res = blk_dwrite(dev_desc, offset + blk, cnt, addr);
+   else
+   res = blk_dread(dev_desc, offset + blk, cnt, addr);
+
+   if (res != cnt) {
+   printf("%s error\n", cmdtp->name);
return 1;
}
 
return 0;
 }
 
+#ifdef CONFIG_CMD_READ
 U_BOOT_CMD(
-   read,   6,  0,  do_read,
+   read,   6,  0,  do_rw,
"Load binary data from a partition",
"  addr blk# cnt"
 );
+#endif
+
+#ifdef CONFIG_CMD_WRITE
+U_BOOT_CMD(
+   write,  6,  0,  do_rw,
+   "Store binary data to a partition",
+   "  addr blk# cnt"
+);
+#endif
-- 
2.37.2