Patchwork [U-Boot,v2] Add a simple load option to setexpr

login
register
mail settings
Submitter Joe Hershberger
Date Nov. 2, 2012, 2:21 a.m.
Message ID <1351822874-9370-1-git-send-email-joe.hershberger@ni.com>
Download mbox | patch
Permalink /patch/196459/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

Joe Hershberger - Nov. 2, 2012, 2:21 a.m.
Make setexpr accept a 2 parameter variant that will simply load a value
into a variable.  This is useful for loading a value from memory.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---
Changes in v2:
- Replaced memory get command with option to setexpr

 common/cmd_setexpr.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)
Tom Rini - Dec. 19, 2012, 11 p.m.
On Thu, Nov 01, 2012 at 04:21:14PM -0000, Joe Hershberger wrote:

> Make setexpr accept a 2 parameter variant that will simply load a value
> into a variable.  This is useful for loading a value from memory.
> 
> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>

Applied to u-boot/master, thanks!

Patch

diff --git a/common/cmd_setexpr.c b/common/cmd_setexpr.c
index 1b3edb7..70133b0 100644
--- a/common/cmd_setexpr.c
+++ b/common/cmd_setexpr.c
@@ -57,12 +57,22 @@  int do_setexpr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	int w;
 
 	/* Validate arguments */
-	if ((argc != 5) || (strlen(argv[3]) != 1))
+	if (argc != 5 && argc != 3)
+		return CMD_RET_USAGE;
+	if (argc == 5 && strlen(argv[3]) != 1)
 		return CMD_RET_USAGE;
 
 	w = cmd_get_data_size(argv[0], 4);
 
 	a = get_arg(argv[2], w);
+
+	if (argc == 3) {
+		sprintf(buf, "%lx", a);
+		setenv(argv[1], buf);
+
+		return 0;
+	}
+
 	b = get_arg(argv[4], w);
 
 	switch (argv[3][0]) {
@@ -87,8 +97,11 @@  int do_setexpr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 U_BOOT_CMD(
 	setexpr, 5, 0, do_setexpr,
 	"set environment variable as the result of eval expression",
-	"[.b, .w, .l] name value1 <op> value2\n"
+	"[.b, .w, .l] name [*]value1 <op> [*]value2\n"
 	"    - set environment variable 'name' to the result of the evaluated\n"
 	"      express specified by <op>.  <op> can be &, |, ^, +, -, *, /, %\n"
-	"      size argument is only meaningful if value1 and/or value2 are memory addresses"
+	"      size argument is only meaningful if value1 and/or value2 are\n"
+	"      memory addresses (*)\n"
+	"setexpr[.b, .w, .l] name *value\n"
+	"    - load a memory address into a variable"
 );