From: Simon Glass <sjg@chromium.org>
Date: Thu, 1 Aug 2019 15:46:44 +0000 (-0600)
Subject: env: Move env_relocate() to env.h
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=3f989e7b0e43402d0a50e19939e4f57374319734;p=u-boot.git

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 84aec7fc71..99b128571e 100644
--- 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 bd340fe9d5..1fbc4a874d 100644
--- 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 55cbe1f97d..cb6b584b70 100644
--- 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 5d205ef02d..72980962bf 100644
--- 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)
  *