Skip to content

Commit

Permalink
Add a simple load option to setexpr
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
jhershbe authored and trini committed Dec 19, 2012
1 parent 2400727 commit 4823b45
Showing 1 changed file with 16 additions and 3 deletions.
19 changes: 16 additions & 3 deletions common/cmd_setexpr.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,22 @@ static 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]) {
Expand All @@ -87,8 +97,11 @@ static 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"
);

0 comments on commit 4823b45

Please sign in to comment.