summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2019-08-01 09:47:00 -0600
committerTom Rini <trini@konsulko.com>2019-08-11 16:43:41 -0400
commit0ac7d722ede8e64973f68dbcd07b9521ba04cb63 (patch)
tree179942d65436fafe8d1c3193bd15913f3b2c5f18 /common
parent1f3db0c135fcaf40ff88bdcd058b56bc7e1f58f3 (diff)
downloadu-boot-0ac7d722ede8e64973f68dbcd07b9521ba04cb63.tar.gz
env: Move get/set_default_env() to env.h
Move these functions to the new header file and rename set_default_env() to env_set_default() so that it has a consistent env_ prefix. Acked-by: Joe Hershberger <joe.hershberger@ni.com> Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
-rw-r--r--common/board_r.c2
-rw-r--r--common/spl/spl_dfu.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/common/board_r.c b/common/board_r.c
index 99b128571e..f4193cdbec 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -448,7 +448,7 @@ static int initr_env(void)
if (should_load_env())
env_relocate();
else
- set_default_env(NULL, 0);
+ env_set_default(NULL, 0);
#ifdef CONFIG_OF_CONTROL
env_set_hex("fdtcontroladdr",
(unsigned long)map_to_sysmem(gd->fdt_blob));
diff --git a/common/spl/spl_dfu.c b/common/spl/spl_dfu.c
index a05b867567..3f54ae0260 100644
--- a/common/spl/spl_dfu.c
+++ b/common/spl/spl_dfu.c
@@ -39,7 +39,7 @@ int spl_dfu_cmd(int usbctrl, char *dfu_alt_info, char *interface, char *devstr)
int ret;
/* set default environment */
- set_default_env(NULL, 0);
+ env_set_default(NULL, 0);
str_env = env_get(dfu_alt_info);
if (!str_env) {
pr_err("\"%s\" env variable not defined!\n", dfu_alt_info);