[U-Boot] [PATCH v2 27/40] env: Move env_reloc() to env.h

Simon Glass
2019-08-01T15:47:02Z

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>
---

Changes in v2: None

include/env.h | 7 +++++++
include/environment.h | 4 ----
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>
--
2.22.0.709.g102302147b-goog