env: Move env_get_f() to env.h

Move this function 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/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index edb9c966581425e4e1bb798e2418e6b1670caca6..9577ada11344e098047e3eeb7e38d46d43fdb66c 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <env.h>
 #include <fsl_ddr_sdram.h>
 #include <asm/io.h>
 #include <linux/errno.h>

diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index cbcd62e19a0b917e34aede528a592b2a43d5b33a..cac928079042beaabf15ed903af215c4a209cd61 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <env.h>
 #include <watchdog.h>
 #include <asm/processor.h>
 #include <ioports.h>

diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c
index 20ecca605ff0fb31bdb6d6f444a3536bffef4a2d..d17c382cc9f4a67d440cbb06a18481d5726522ef 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/fdt.c
+++ b/arch/powerpc/cpu/mpc85xx/fdt.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <env.h>
 #include <environment.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>

diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
index 2fab9aaff41d664abec3d5fb1543f4d1b641202a..fcfa73023347c4525f1d9f1ae3ff7d55c4386bcc 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <env.h>
 #ifdef CONFIG_SYS_P4080_ERRATUM_SERDES8
 #include <hwconfig.h>
 #endif

diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c
index 29b634113208d9a5f76ba4ad7b7258a1135141e6..b0d2f7b6f87b1b76b97a416b769006ce951d26d5 100644 (file)
--- a/board/esd/meesc/meesc.c
+++ b/board/esd/meesc/meesc.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <env.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/mach-types.h>

diff --git a/board/freescale/b4860qds/b4860qds.c b/board/freescale/b4860qds/b4860qds.c
index 9eed95b6562f85237be79192781d797880fb8e70..33cd4b496489d14cc47393a2be1a525934f30fc0 100644 (file)
--- a/board/freescale/b4860qds/b4860qds.c
+++ b/board/freescale/b4860qds/b4860qds.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <env.h>
 #include <i2c.h>
 #include <netdev.h>
 #include <linux/compiler.h>

diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c
index 18f396aac8bd50009b9afaba7a0552eedfbfb55f..4ad62bcf1d6b5384fe72b8e816ec0f3e1e175b7c 100644 (file)
--- a/board/freescale/mpc837xerdb/mpc837xerdb.c
+++ b/board/freescale/mpc837xerdb/mpc837xerdb.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <env.h>
 #include <hwconfig.h>
 #include <i2c.h>
 #include <asm/io.h>

diff --git a/board/liebherr/mccmon6/mccmon6.c b/board/liebherr/mccmon6/mccmon6.c
index 0e069a7755571316ad9723e9ce29e1f8309cadfe..7d2751ab0393454ace2b72fc546f34e2660f39aa 100644 (file)
--- a/board/liebherr/mccmon6/mccmon6.c
+++ b/board/liebherr/mccmon6/mccmon6.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <env.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>

diff --git a/board/micronas/vct/vct.c b/board/micronas/vct/vct.c
index af3f11e8ac1df803a84a635b9b1b8042ca212929..e73d16db3eaf7c8cb62e698955c44b28071a0bbc 100644 (file)
--- a/board/micronas/vct/vct.c
+++ b/board/micronas/vct/vct.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <env.h>
 #include <netdev.h>
 #include <asm/mipsregs.h>
 #include "vct.h"

diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c
index ff465a8ef2bda51759d8b26898ff01ab32bc5c7b..da9ae5bebb7e01cad5d5c4cb9f27c11af7408e47 100644 (file)
--- a/board/socrates/socrates.c
+++ b/board/socrates/socrates.c
@@ -11,6 +11,7 @@
  */
 
 #include <common.h>
+#include <env.h>
 #include <pci.h>
 #include <asm/processor.h>
 #include <asm/immap_85xx.h>

diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index b99c6c08a34262e91a11d8cb8d2ddfaa11c0e0e5..1f9251d7a0d085fa3fdf86e1f7c2e411b178d05e 100644 (file)
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -8,6 +8,7 @@
 #include <config.h>
 #include <clk.h>
 #include <dm.h>
+#include <env.h>
 #include <environment.h>
 #include <g_dnl.h>
 #include <generic-phy.h>

diff --git a/board/xes/common/board.c b/board/xes/common/board.c
index 66467c6485eac384a54361ac85ffca7c36689cc4..43575bc302d6b58692657c49274d1a32c12ffed6 100644 (file)
--- a/board/xes/common/board.c
+++ b/board/xes/common/board.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <env.h>
 #include "fsl_8xxx_misc.h"
 
 int checkboard(void)

diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c
index f7ed1a077974666505d0612770ede58601b473ed..46155cabf66c30eaa5245c2dacd7a9f00e0fd953 100644 (file)
--- a/cmd/mtdparts.c
+++ b/cmd/mtdparts.c
@@ -72,6 +72,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <env.h>
 #include <malloc.h>
 #include <jffs2/load_kernel.h>
 #include <linux/list.h>

diff --git a/drivers/ddr/fsl/fsl_ddr_gen4.c b/drivers/ddr/fsl/fsl_ddr_gen4.c
index 30f7863b39ad71bf73b25c93b8cc416226c2c0dd..17a4a8282b7312565ec19af1b5403f23d5d4b515 100644 (file)
--- a/drivers/ddr/fsl/fsl_ddr_gen4.c
+++ b/drivers/ddr/fsl/fsl_ddr_gen4.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <env.h>
 #include <asm/io.h>
 #include <fsl_ddr_sdram.h>
 #include <asm/processor.h>

diff --git a/drivers/ddr/fsl/interactive.c b/drivers/ddr/fsl/interactive.c
index 4de0eae5f28f3ae99867ad1f62dc3bc3442e9c37..8e171e67fec21890a047fa8e32cb1bf1a6a29d49 100644 (file)
--- a/drivers/ddr/fsl/interactive.c
+++ b/drivers/ddr/fsl/interactive.c
@@ -13,6 +13,7 @@
 
 #include <common.h>
 #include <cli.h>
+#include <env.h>
 #include <linux/ctype.h>
 #include <asm/types.h>
 #include <asm/io.h>

diff --git a/drivers/ddr/fsl/options.c b/drivers/ddr/fsl/options.c
index 4573ffa11517c11a5df24248cbd2903126a7559d..b9179315f2522ac81fe93fa7d5ba4b6a5e11afa8 100644 (file)
--- a/drivers/ddr/fsl/options.c
+++ b/drivers/ddr/fsl/options.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <env.h>
 #include <hwconfig.h>
 #include <fsl_ddr_sdram.h>
 

diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 6b97e145e99f2a9696c959561defc39b1576fa86..6c22f074b0b79fb962ad10305b74fbaab16aa868 100644 (file)
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -19,6 +19,7 @@
 #include <common.h>
 #include <console.h>
 #include <dm.h>
+#include <env.h>
 #include <errno.h>
 #include <fdt_support.h>
 #include <asm/processor.h>

diff --git a/drivers/mtd/mtd_uboot.c b/drivers/mtd/mtd_uboot.c
index 0a41ed477c1db4e0f09a16f8ea7234f754a3505a..557422759831b1215726318f665670308628f545 100644 (file)
--- a/drivers/mtd/mtd_uboot.c
+++ b/drivers/mtd/mtd_uboot.c
@@ -4,6 +4,7 @@
  * Heiko Schocher, DENX Software Engineering, hs@denx.de.
  */
 #include <common.h>
+#include <env.h>
 #include <dm/device.h>
 #include <dm/uclass-internal.h>
 #include <jffs2/jffs2.h> /* LEGACY */

diff --git a/drivers/net/fm/b4860.c b/drivers/net/fm/b4860.c
index 1e2068580377e9809143785631b69981197d799b..5be0ad2ab3db3d93914434a41d3151e07ada43f4 100644 (file)
--- a/drivers/net/fm/b4860.c
+++ b/drivers/net/fm/b4860.c
@@ -4,6 +4,7 @@
  *     Roy Zang <tie-fei.zang@freescale.com>
  */
 #include <common.h>
+#include <env.h>
 #include <phy.h>
 #include <fm_eth.h>
 #include <asm/io.h>

diff --git a/include/common.h b/include/common.h
index 997da857b2c25c09860fbc52c69e85ad09ff735f..2aabd267b9f78ce8be0dd65da7fdb5febed26685 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -162,18 +162,6 @@ int        envmatch     (uchar *, int);
  */
 char *env_get(const char *varname);
 
-/**
- * env_get_f() - Look up the value of an environment variable (early)
- *
- * This function is called from env_get() if the environment has not been
- * loaded yet (GD_FLG_ENV_READY flag is 0). Some environment locations will
- * support reading the value (slowly) and some will not.
- *
- * @varname:   Variable to look up
- * @return value of variable, or NULL if not found
- */
-int env_get_f(const char *name, char *buf, unsigned len);
-
 /**
  * env_get_ulong() - Return an environment variable as an integer value
  *

diff --git a/include/env.h b/include/env.h
index b82d80de177714a32bb9547465ad8ba979a05599..19b559abf15508e39e14087e2261cbfa2361cfa9 100644 (file)
--- a/include/env.h
+++ b/include/env.h
@@ -21,6 +21,18 @@
  */
 int env_get_id(void);
 
+/**
+ * env_get_f() - Look up the value of an environment variable (early)
+ *
+ * This function is called from env_get() if the environment has not been
+ * loaded yet (GD_FLG_ENV_READY flag is 0). Some environment locations will
+ * support reading the value (slowly) and some will not.
+ *
+ * @varname:   Variable to look up
+ * @return value of variable, or NULL if not found
+ */
+int env_get_f(const char *name, char *buf, unsigned int len);
+
 /**
  * env_complete() - return an auto-complete for environment variables
  *

diff --git a/post/post.c b/post/post.c
index ebb620590e3f6e3c1502536a5dbd46fa5a38e672..fb751d9a83a5c14c6bce38ada5e3d2c803123e41 100644 (file)
--- a/post/post.c
+++ b/post/post.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <env.h>
 #include <stdio_dev.h>
 #include <watchdog.h>
 #include <div64.h>