Move this function over to the new header file.
Signed-off-by: Simon Glass sjg@chromium.org ---
arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 1 + arch/powerpc/cpu/mpc85xx/cpu_init.c | 1 + arch/powerpc/cpu/mpc85xx/fdt.c | 1 + arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c | 1 + board/esd/meesc/meesc.c | 1 + board/freescale/b4860qds/b4860qds.c | 1 + board/freescale/mpc837xerdb/mpc837xerdb.c | 1 + board/liebherr/mccmon6/mccmon6.c | 1 + board/micronas/vct/vct.c | 1 + board/socrates/socrates.c | 1 + board/st/stm32mp1/stm32mp1.c | 1 + board/xes/common/board.c | 1 + cmd/mtdparts.c | 1 + drivers/ddr/fsl/fsl_ddr_gen4.c | 1 + drivers/ddr/fsl/interactive.c | 1 + drivers/ddr/fsl/options.c | 1 + drivers/mtd/cfi_flash.c | 1 + drivers/mtd/mtd_uboot.c | 1 + drivers/net/fm/b4860.c | 1 + include/common.h | 12 ------------ include/env.h | 12 ++++++++++++ post/post.c | 1 + 22 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index edb9c96658..9577ada113 100644 --- 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 cbcd62e19a..cac9280790 100644 --- 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 20ecca605f..d17c382cc9 100644 --- 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 2fab9aaff4..fcfa730233 100644 --- 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 29b6341132..b0d2f7b6f8 100644 --- 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 9eed95b656..33cd4b4964 100644 --- 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 18f396aac8..4ad62bcf1d 100644 --- 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 0e069a7755..7d2751ab03 100644 --- 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 af3f11e8ac..e73d16db3e 100644 --- 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 ff465a8ef2..da9ae5bebb 100644 --- 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 b99c6c08a3..1f9251d7a0 100644 --- 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 66467c6485..43575bc302 100644 --- 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 f7ed1a0779..46155cabf6 100644 --- 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 30f7863b39..17a4a8282b 100644 --- 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 4de0eae5f2..8e171e67fe 100644 --- 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 4573ffa115..b9179315f2 100644 --- 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 6b97e145e9..6c22f074b0 100644 --- 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 0a41ed477c..5574227598 100644 --- 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 1e20685803..5be0ad2ab3 100644 --- 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 997da857b2..2aabd267b9 100644 --- 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 b82d80de17..19b559abf1 100644 --- 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 ebb620590e..fb751d9a83 100644 --- 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>