env: Move env_init() to env.h

Move env_init() 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/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
index 3e53084b215dfe8e0572877d89a878dccd229dad..8eeeef199b154e15dffcd9360bb9425af57e3aec 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <env.h>
 #include <spl.h>
 #include <asm/io.h>
 #include <fsl_ifc.h>

diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c
index 6a462f3e5a5edf45ecb9f704d85d5bae6897a80a..8c0d7672f24ceab122c70e54236748f366b4eb25 100644 (file)
--- a/arch/mips/lib/bootm.c
+++ b/arch/mips/lib/bootm.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <env.h>
 #include <image.h>
 #include <fdt_support.h>
 #include <asm/addrspace.h>

diff --git a/board/Arcturus/ucp1020/spl.c b/board/Arcturus/ucp1020/spl.c
index 451a9d78bb05466e56f1395605a3bdcd58022187..f3b7d99878c66478b9e83a6fc35f425d875f7656 100644 (file)
--- a/board/Arcturus/ucp1020/spl.c
+++ b/board/Arcturus/ucp1020/spl.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <console.h>
+#include <env.h>
 #include <environment.h>
 #include <ns16550.h>
 #include <malloc.h>

diff --git a/board/birdland/bav335x/board.c b/board/birdland/bav335x/board.c
index b95186026fdafe7ad6b70ac36a6e7d14914b176a..b0339ad8f0240b5f1e42bb71c02985fb327adb13 100644 (file)
--- a/board/birdland/bav335x/board.c
+++ b/board/birdland/bav335x/board.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <env.h>
 #include <errno.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>

diff --git a/board/freescale/b4860qds/spl.c b/board/freescale/b4860qds/spl.c
index 887fa04627d6ac11354a1d0d474da8706b290f25..d9aa57f41c3950c194ece878788d5686ff8492a0 100644 (file)
--- a/board/freescale/b4860qds/spl.c
+++ b/board/freescale/b4860qds/spl.c
@@ -4,6 +4,7 @@
 
 #include <common.h>
 #include <console.h>
+#include <env.h>
 #include <environment.h>
 #include <asm/spl.h>
 #include <malloc.h>

diff --git a/board/freescale/p1010rdb/spl.c b/board/freescale/p1010rdb/spl.c
index e07640a0edf1f9da28eb5bc9637b466ba3f1ced6..95f8b5837ddecf38889fc56b65374b80167f0a6b 100644 (file)
--- a/board/freescale/p1010rdb/spl.c
+++ b/board/freescale/p1010rdb/spl.c
@@ -4,6 +4,7 @@
 
 #include <common.h>
 #include <console.h>
+#include <env.h>
 #include <environment.h>
 #include <ns16550.h>
 #include <malloc.h>

diff --git a/board/freescale/p1022ds/spl.c b/board/freescale/p1022ds/spl.c
index cfdd9fc9c9a8996be71b2f4bd7794c64fe006c61..92fd199876b93fca903ffbc4997a53e413b5ce22 100644 (file)
--- a/board/freescale/p1022ds/spl.c
+++ b/board/freescale/p1022ds/spl.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <console.h>
+#include <env.h>
 #include <environment.h>
 #include <ns16550.h>
 #include <malloc.h>

diff --git a/board/freescale/p1_p2_rdb_pc/spl.c b/board/freescale/p1_p2_rdb_pc/spl.c
index 48ab271fb29cb55a0c0ae68f955533c27cfd9af7..9d7b5eff6f105e7ffa31d630d7062e2b1ab52ecf 100644 (file)
--- a/board/freescale/p1_p2_rdb_pc/spl.c
+++ b/board/freescale/p1_p2_rdb_pc/spl.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <console.h>
+#include <env.h>
 #include <environment.h>
 #include <ns16550.h>
 #include <malloc.h>

diff --git a/board/gateworks/gw_ventana/gw_ventana_spl.c b/board/gateworks/gw_ventana/gw_ventana_spl.c
index eaf7aa9ecad95455f25e1f4b24af6a61bc89e3c7..740fc57b911adee2e68b2abb8626bcb58addcbcd 100644 (file)
--- a/board/gateworks/gw_ventana/gw_ventana_spl.c
+++ b/board/gateworks/gw_ventana/gw_ventana_spl.c
@@ -13,6 +13,7 @@
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/mxc_i2c.h>
+#include <env.h>
 #include <environment.h>
 #include <i2c.h>
 #include <spl.h>

diff --git a/board/liebherr/display5/spl.c b/board/liebherr/display5/spl.c
index 27f843ec45ce90b844e212dcdc8f87079f229505..d92760b4870d372fb9616f1587e9306a32991384 100644 (file)
--- a/board/liebherr/display5/spl.c
+++ b/board/liebherr/display5/spl.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <env.h>
 #include <spl.h>
 #include <linux/libfdt.h>
 #include <asm/io.h>

diff --git a/board/tcl/sl50/board.c b/board/tcl/sl50/board.c
index 6bb6482dd06ece1ce0a70441fcc4438324c674b2..8ddbee543636409dc1b8b9832292463c90284787 100644 (file)
--- a/board/tcl/sl50/board.c
+++ b/board/tcl/sl50/board.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <env.h>
 #include <errno.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>

diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index 2c32b92d940667916250585ca34b976cc51a562c..58d09f7c20f7d4af4108dc10f6a6c99a7a6f5265 100644 (file)
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <env.h>
 #include <errno.h>
 #include <spl.h>
 #include <serial.h>

diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index 1a903f13a6b4e666fa999ed4b5ab3c4b60d1d0c1..0dacfd43277e8ae12c4883accbdde9ff7a3d632e 100644 (file)
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <env.h>
 #include <palmas.h>
 #include <sata.h>
 #include <usb.h>

diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c
index 179adc2fff0ec97eb07abc120346a56128485600..97eef65d51af99b535c9a118afd3c257aa173477 100644 (file)
--- a/board/ti/dra7xx/evm.c
+++ b/board/ti/dra7xx/evm.c
@@ -10,6 +10,7 @@
  * Steve Sakoman  <steve@sakoman.com>
  */
 #include <common.h>
+#include <env.h>
 #include <palmas.h>
 #include <sata.h>
 #include <linux/string.h>

diff --git a/common/board_f.c b/common/board_f.c
index 7d656fae6ad2bb8f0ebbeb996d9d8fe5801a4464..18937bf6f5d9b9e4474540b34992c3f23358d16a 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -14,6 +14,7 @@
 #include <console.h>
 #include <cpu.h>
 #include <dm.h>
+#include <env.h>
 #include <environment.h>
 #include <fdtdec.h>
 #include <fs.h>

diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c
index c91ad2b6ddd116a21388cae6dad6bbdd3ae444ed..803303249c72c623a886ee3425e95b6c26de330c 100644 (file)
--- a/common/spl/spl_net.c
+++ b/common/spl/spl_net.c
@@ -7,6 +7,7 @@
  * Ilya Yanok <ilya.yanok@gmail.com>
  */
 #include <common.h>
+#include <env.h>
 #include <errno.h>
 #include <spl.h>
 #include <net.h>

diff --git a/env/env.c b/env/env.c
index d3cbe2f9158429c95c095c9bed6564d9285702ef..9d421e81256ba50c101d06c8e3660052bc02af55 100644 (file)
--- a/env/env.c
+++ b/env/env.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <env.h>
 #include <environment.h>
 
 DECLARE_GLOBAL_DATA_PTR;

diff --git a/include/common.h b/include/common.h
index 2aabd267b9f78ce8be0dd65da7fdb5febed26685..55cbe1f97d19d558c99c4a74ca20b129327c9641 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 */
-int    env_init     (void);
 void   env_relocate (void);
 int    envmatch     (uchar *, int);
 

diff --git a/include/env.h b/include/env.h
index 19b559abf15508e39e14087e2261cbfa2361cfa9..5d205ef02d913eb2d4f3280a49df89d1e299715a 100644 (file)
--- a/include/env.h
+++ b/include/env.h
@@ -21,6 +21,16 @@
  */
 int env_get_id(void);
 
+/**
+ * env_init() - Set up the pre-relocation environment
+ *
+ * This locates the environment or uses the default if nothing is available.
+ * This must be called before env_get() will work.
+ *
+ * @return 0 if OK, -ENODEV if no environment drivers are enabled
+ */
+int env_init(void);
+
 /**
  * env_get_f() - Look up the value of an environment variable (early)
  *