[U-Boot] [PATCH 26/39] env: Move env_reloc() to env.h

Simon Glass sjg at chromium.org
Sun Jul 28 14:03:43 UTC 2019


Move env_reloc() over to the new header file.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 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 827d96cc86..82214d973e 100644
--- a/include/env.h
+++ b/include/env.h
@@ -289,4 +289,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



More information about the U-Boot mailing list