summaryrefslogtreecommitdiff
path: root/env
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2017-08-03 18:22:07 (GMT)
committerTom Rini <trini@konsulko.com>2017-08-16 00:50:29 (GMT)
commit310fb14b2631b2175efe9b0e56d0f1630ad02d91 (patch)
tree2e54133d897af5c49ff1727feef4fab07e235fe3 /env
parenta69d0f60e500a7ba0be8d33fb6321e3b38cd21df (diff)
downloadu-boot-310fb14b2631b2175efe9b0e56d0f1630ad02d91.tar.xz
env: Drop env_relocate_spec() in favour of env_load()
This is a strange name for a function that loads the environment. There is now only one implementation of this function, so use the new env_load() function directly instead. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'env')
-rw-r--r--env/common.c2
-rw-r--r--env/env.c5
2 files changed, 1 insertions, 6 deletions
diff --git a/env/common.c b/env/common.c
index 9b3a268..0cc8829 100644
--- a/env/common.c
+++ b/env/common.c
@@ -280,7 +280,7 @@ void env_relocate(void)
set_default_env("!bad CRC");
#endif
} else {
- env_relocate_spec();
+ env_load();
}
}
diff --git a/env/env.c b/env/env.c
index a239d93..85d95e5 100644
--- a/env/env.c
+++ b/env/env.c
@@ -150,11 +150,6 @@ int env_init(void)
return 0;
}
-void env_relocate_spec(void)
-{
- env_load();
-}
-
int saveenv(void)
{
return env_save();