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>
@@ -4,6 +4,7 @@
*/
#include <common.h>
+#include <env.h>
#include <spl.h>
#include <asm/io.h>
#include <fsl_ifc.h>
@@ -5,6 +5,7 @@
#include <image.h>
#include <fdt_support.h>
#include <asm/addrspace.h>
@@ -9,6 +9,7 @@
#include <console.h>
#include <environment.h>
#include <ns16550.h>
#include <malloc.h>
@@ -8,6 +8,7 @@
#include <errno.h>
#include <asm/arch/cpu.h>
#include <asm/spl.h>
@@ -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 <i2c.h>
#include <linux/libfdt.h>
#include <dm.h>
#include <serial.h>
#include <palmas.h>
#include <sata.h>
#include <usb.h>
@@ -10,6 +10,7 @@
* Steve Sakoman <steve@sakoman.com>
#include <linux/string.h>
@@ -14,6 +14,7 @@
#include <cpu.h>
#include <fdtdec.h>
#include <fs.h>
@@ -7,6 +7,7 @@
* Ilya Yanok <ilya.yanok@gmail.com>
#include <net.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -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);
@@ -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)
*