aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2017-08-03 12:22:07 -0600
committerTom Rini <trini@konsulko.com>2017-08-15 20:50:29 -0400
commit310fb14b2631b2175efe9b0e56d0f1630ad02d91 (patch)
tree2e54133d897af5c49ff1727feef4fab07e235fe3 /include
parenta69d0f60e500a7ba0be8d33fb6321e3b38cd21df (diff)
downloadu-boot-310fb14b2631b2175efe9b0e56d0f1630ad02d91.zip
u-boot-310fb14b2631b2175efe9b0e56d0f1630ad02d91.tar.gz
u-boot-310fb14b2631b2175efe9b0e56d0f1630ad02d91.tar.bz2
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 'include')
-rw-r--r--include/environment.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/include/environment.h b/include/environment.h
index 1df2434..b4f9366 100644
--- a/include/environment.h
+++ b/include/environment.h
@@ -170,8 +170,6 @@ extern env_t environment;
extern const unsigned char default_environment[];
extern env_t *env_ptr;
-extern void env_relocate_spec(void);
-
#if defined(CONFIG_NEEDS_MANUAL_RELOC)
extern void env_reloc(void);
#endif
@@ -320,6 +318,13 @@ struct env_driver *env_driver_lookup_default(void);
*/
int env_get_char(int index);
+/**
+ * env_load() - Load the environment from storage
+ *
+ * @return 0 if OK, -ve on error
+ */
+int env_load(void);
+
#endif /* DO_DEPS_ONLY */
#endif /* _ENVIRONMENT_H_ */