aboutsummaryrefslogtreecommitdiff
path: root/env/ubi.c
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 /env/ubi.c
parent1f3db0c135fcaf40ff88bdcd058b56bc7e1f58f3 (diff)
downloadu-boot-0ac7d722ede8e64973f68dbcd07b9521ba04cb63.zip
u-boot-0ac7d722ede8e64973f68dbcd07b9521ba04cb63.tar.gz
u-boot-0ac7d722ede8e64973f68dbcd07b9521ba04cb63.tar.bz2
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 'env/ubi.c')
-rw-r--r--env/ubi.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/env/ubi.c b/env/ubi.c
index e4b8516..a69db14 100644
--- a/env/ubi.c
+++ b/env/ubi.c
@@ -7,6 +7,7 @@
#include <common.h>
#include <command.h>
+#include <env.h>
#include <environment.h>
#include <errno.h>
#include <malloc.h>
@@ -123,7 +124,7 @@ static int env_ubi_load(void)
if (ubi_part(CONFIG_ENV_UBI_PART, UBI_VID_OFFSET)) {
printf("\n** Cannot find mtd partition \"%s\"\n",
CONFIG_ENV_UBI_PART);
- set_default_env(NULL, 0);
+ env_set_default(NULL, 0);
return -EIO;
}
@@ -160,14 +161,14 @@ static int env_ubi_load(void)
if (ubi_part(CONFIG_ENV_UBI_PART, UBI_VID_OFFSET)) {
printf("\n** Cannot find mtd partition \"%s\"\n",
CONFIG_ENV_UBI_PART);
- set_default_env(NULL, 0);
+ env_set_default(NULL, 0);
return -EIO;
}
if (ubi_volume_read(CONFIG_ENV_UBI_VOLUME, buf, CONFIG_ENV_SIZE)) {
printf("\n** Unable to read env from %s:%s **\n",
CONFIG_ENV_UBI_PART, CONFIG_ENV_UBI_VOLUME);
- set_default_env(NULL, 0);
+ env_set_default(NULL, 0);
return -EIO;
}