summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2019-08-01 18:47:02 +0300
committerTom Rini <trini@konsulko.com>2019-08-11 23:43:41 +0300
commitc62f62b0fccca951bdc91f3ab85f495fdcc0efb2 (patch)
treeecfa7ad899aa6fa605da07332d2796eb1ee730ea
parentb5f449e8e947cf94055d0300a8625cd6bc9c37f5 (diff)
downloadu-boot-c62f62b0fccca951bdc91f3ab85f495fdcc0efb2.tar.xz
env: Move env_reloc() to env.h
Move env_reloc() over to the new header file. Acked-by: Joe Hershberger <joe.hershberger@ni.com> Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--include/env.h7
-rw-r--r--include/environment.h4
2 files changed, 7 insertions, 4 deletions
diff --git a/include/env.h b/include/env.h
index 42d8bcfa50..727f58528f 100644
--- a/include/env.h
+++ b/include/env.h
@@ -278,4 +278,11 @@ void env_set_default(const char *s, int flags);
*/
int env_get_char(int index);
+/**
+ * env_reloc() - Relocate the 'env' sub-commands
+ *
+ * This is used for those unfortunate archs with crappy toolchains
+ */
+void env_reloc(void);
+
#endif
diff --git a/include/environment.h b/include/environment.h
index ea45b57628..d23b92833e 100644
--- a/include/environment.h
+++ b/include/environment.h
@@ -158,10 +158,6 @@ extern env_t environment;
extern const unsigned char default_environment[];
-#if defined(CONFIG_NEEDS_MANUAL_RELOC)
-extern void env_reloc(void);
-#endif
-
#ifndef DO_DEPS_ONLY
#include <env_attr.h>