diff options
author | Yaniv Levinsky <yaniv.levinsky@compulab.co.il> | 2018-06-24 19:16:55 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2018-07-19 16:17:58 -0400 |
commit | 477f8116d517798d4d6456d920d57ff2f46d4271 (patch) | |
tree | 794f331d8570273b9b2582e79b79c2cd6642fa64 /include/environment.h | |
parent | 30091494eba7ddd788f0beaec04a986c3ba4f193 (diff) | |
download | u-boot-477f8116d517798d4d6456d920d57ff2f46d4271.zip u-boot-477f8116d517798d4d6456d920d57ff2f46d4271.tar.gz u-boot-477f8116d517798d4d6456d920d57ff2f46d4271.tar.bz2 |
cmd: nvedit: propagate envflag to set_default_vars
The env_flag in do_env_default() doesn't get propagated and therefore
gets ignored by himport_r(). This breaks to ability to "forcibly" reset
variables to their default values using the environment command.
Scenario example of the problem:
# setenv kernel uImage
# setenv .flags kernel:so
# env default -f kernel
## Error: Can't overwrite "kernel"
himport_r: can't insert "kernel=zImage" into hash table
Change the call path so it will pass the flag correctly.
Signed-off-by: Yaniv Levinsky <yaniv.levinsky@compulab.co.il>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Diffstat (limited to 'include/environment.h')
-rw-r--r-- | include/environment.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/environment.h b/include/environment.h index 70b7eda..2fe1f3e 100644 --- a/include/environment.h +++ b/include/environment.h @@ -275,7 +275,7 @@ char *env_get_default(const char *name); void set_default_env(const char *s); /* [re]set individual variables to their value in the default environment */ -int set_default_vars(int nvars, char * const vars[]); +int set_default_vars(int nvars, char * const vars[], int flags); /* Import from binary representation into hash table */ int env_import(const char *buf, int check); |