env: Move env_relocate() to env.h

Move env_relocate() over to the new header file.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>

diff --git a/common/board_r.c b/common/board_r.c
index 84aec7fc71cf5203dc3ae28c65f068a46a8bab8e..99b128571ec1b29098b77a551c4c936a9c101a0c 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -18,6 +18,7 @@
 #include <command.h>
 #include <console.h>
 #include <dm.h>
+#include <env.h>
 #include <environment.h>
 #include <fdtdec.h>
 #include <ide.h>

diff --git a/env/common.c b/env/common.c
index bd340fe9d52d7bdfb62d68c83ceca6954ccf27ae..1fbc4a874d894cd5db278ca6beee30f5c5def04f 100644 (file)
--- a/env/common.c
+++ b/env/common.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <env.h>
 #include <environment.h>
 #include <linux/stddef.h>
 #include <search.h>

diff --git a/include/common.h b/include/common.h
index 55cbe1f97d19d558c99c4a74ca20b129327c9641..cb6b584b7090b4ba5120ee1ea07aa824148a0e3a 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -146,7 +146,6 @@ int do_fat_fsload(cmd_tbl_t *, int, int, char * const []);
 int do_ext2load(cmd_tbl_t *, int, int, char * const []);
 
 /* common/cmd_nvedit.c */
-void   env_relocate (void);
 int    envmatch     (uchar *, int);
 
 /**

diff --git a/include/env.h b/include/env.h
index 5d205ef02d913eb2d4f3280a49df89d1e299715a..72980962bf7199cba48d2ec2a9ab2ae8fad586bb 100644 (file)
--- a/include/env.h
+++ b/include/env.h
@@ -31,6 +31,14 @@ int env_get_id(void);
  */
 int env_init(void);
 
+/**
+ * env_relocate() - Set up the post-relocation environment
+ *
+ * This loads the environment into RAM so that it can be modified. This is
+ * called after relocation, before the environment is used
+ */
+void env_relocate(void);
+
 /**
  * env_get_f() - Look up the value of an environment variable (early)
  *