diff options
| author | Gerlando Falauto <gerlando.falauto@keymile.com> | 2012-08-24 00:11:38 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-09-18 12:01:52 -0700 |
| commit | 348b1f1c6064990210a6797c86514fd358b73062 (patch) | |
| tree | 05d75464ef3a543a3c84a2fc7b2e2c3a61c029b3 /common | |
| parent | c3f6525854bbc664ce9fbed9754af1daf56ba08e (diff) | |
| download | blackbird-obmc-uboot-348b1f1c6064990210a6797c86514fd358b73062.tar.gz blackbird-obmc-uboot-348b1f1c6064990210a6797c86514fd358b73062.zip | |
env: make himport_r() selective on variables
Add 2 new arguments to himport_r():
o "nvars", "vars": number and list of variables to take into account
(0 means ALL)
NOTE: This patch does not change the current behaviour.
Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com>
Reviewed-by: Marek Vasut <marex@denx.de>
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_nvedit.c | 3 | ||||
| -rw-r--r-- | common/env_common.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index 86518d4370..c601b3ac27 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -914,7 +914,8 @@ static int do_env_import(cmd_tbl_t *cmdtp, int flag, addr = (char *)ep->data; } - if (himport_r(&env_htab, addr, size, sep, del ? 0 : H_NOCLEAR) == 0) { + if (himport_r(&env_htab, addr, size, sep, del ? 0 : H_NOCLEAR, + 0, NULL) == 0) { error("Environment import failed: errno = %d\n", errno); return 1; } diff --git a/common/env_common.c b/common/env_common.c index 911a6afd1b..c5cefd8a50 100644 --- a/common/env_common.c +++ b/common/env_common.c @@ -196,7 +196,8 @@ void set_default_env(const char *s) } if (himport_r(&env_htab, (char *)default_environment, - sizeof(default_environment), '\0', 0) == 0) + sizeof(default_environment), '\0', 0, + 0, NULL) == 0) error("Environment import failed: errno = %d\n", errno); gd->flags |= GD_FLG_ENV_READY; @@ -221,7 +222,8 @@ int env_import(const char *buf, int check) } } - if (himport_r(&env_htab, (char *)ep->data, ENV_SIZE, '\0', 0)) { + if (himport_r(&env_htab, (char *)ep->data, ENV_SIZE, '\0', 0, + 0, NULL)) { gd->flags |= GD_FLG_ENV_READY; return 1; } |
