env: Drop environment.h header file where not needed

This header file is now only used by files that access internal
environment features. Drop it from various places where it is not needed.

Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/cpu/arm926ejs/spear/spr_misc.c b/arch/arm/cpu/arm926ejs/spear/spr_misc.c
index 533268513ee346d8c23a1582d93107d0486bac11..d36484c9d69ab99ba03268bf02106d0d0e308480 100644 (file)
--- a/arch/arm/cpu/arm926ejs/spear/spr_misc.c
+++ b/arch/arm/cpu/arm926ejs/spear/spr_misc.c
@@ -7,7 +7,6 @@
 #include <common.h>
 #include <command.h>
 #include <env.h>
-#include <environment.h>
 #include <i2c.h>
 #include <net.h>
 #include <linux/mtd/st_smi.h>

diff --git a/arch/arm/mach-davinci/misc.c b/arch/arm/mach-davinci/misc.c
index b310bc7293e66ca330390bf29a41f0ef7510ffd6..80e964274e19310449e0211f74d504c5f73d4393 100644 (file)
--- a/arch/arm/mach-davinci/misc.c
+++ b/arch/arm/mach-davinci/misc.c
@@ -10,7 +10,6 @@
 
 #include <common.h>
 #include <env.h>
-#include <environment.h>
 #include <i2c.h>
 #include <net.h>
 #include <asm/arch/hardware.h>

diff --git a/arch/arm/mach-imx/cmd_dek.c b/arch/arm/mach-imx/cmd_dek.c
index 463b869420b000d6402a83dec0d40ca302c092f1..1b111ba26b1397d881f7583f1deeef044f75afa1 100644 (file)
--- a/arch/arm/mach-imx/cmd_dek.c
+++ b/arch/arm/mach-imx/cmd_dek.c
@@ -7,7 +7,6 @@
 
 #include <common.h>
 #include <command.h>
-#include <environment.h>
 #include <malloc.h>
 #include <asm/byteorder.h>
 #include <linux/compiler.h>

diff --git a/arch/arm/mach-imx/mx6/opos6ul.c b/arch/arm/mach-imx/mx6/opos6ul.c
index 183a0c961c4835893bcfdf8cc4cbe84c891897c6..3ab9a3f022f76c96949a8cf77520d8bd9ef83b5e 100644 (file)
--- a/arch/arm/mach-imx/mx6/opos6ul.c
+++ b/arch/arm/mach-imx/mx6/opos6ul.c
@@ -14,7 +14,6 @@
 #include <asm/io.h>
 #include <common.h>
 #include <env.h>
-#include <environment.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c
index 08a7aae2b9f8c3c4e7ea52b63311d815de4bf088..0843dca156c78f60e484d776b96c0f372de8c7c7 100644 (file)
--- a/arch/arm/mach-meson/board-common.c
+++ b/arch/arm/mach-meson/board-common.c
@@ -8,7 +8,6 @@
 #include <env.h>
 #include <linux/libfdt.h>
 #include <linux/err.h>
-#include <environment.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/sm.h>
 #include <asm/armv8/mmu.h>

diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c
index c8b8ac657fbff3abed5a5d1ad9be851ed97076db..eb8c5843fafac3c8da9811dadd36411861e8d4da 100644 (file)
--- a/arch/arm/mach-omap2/boot-common.c
+++ b/arch/arm/mach-omap2/boot-common.c
@@ -9,7 +9,6 @@
 
 #include <common.h>
 #include <ahci.h>
-#include <environment.h>
 #include <spl.h>
 #include <asm/omap_common.h>
 #include <asm/arch/omap.h>

diff --git a/arch/arm/mach-omap2/omap3/clock.c b/arch/arm/mach-omap2/omap3/clock.c
index cb9e91ebc3b375dd7ca7894f6e32d95942eddf20..71f73492c6c47bfe58ca9d37da0ae93512fb01ad 100644 (file)
--- a/arch/arm/mach-omap2/omap3/clock.c
+++ b/arch/arm/mach-omap2/omap3/clock.c
@@ -17,7 +17,6 @@
 #include <asm/arch/clocks_omap3.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/sys_proto.h>
-#include <environment.h>
 #include <command.h>
 
 /******************************************************************************

diff --git a/arch/arm/mach-omap2/utils.c b/arch/arm/mach-omap2/utils.c
index 5478416e9c8659f1204286ef093b9f054353d34c..0d5ca20e8e87818fd9549d42b9007acf4b76a051 100644 (file)
--- a/arch/arm/mach-omap2/utils.c
+++ b/arch/arm/mach-omap2/utils.c
@@ -5,7 +5,6 @@
  */
 #include <common.h>
 #include <env.h>
-#include <environment.h>
 #include <asm/setup.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/omap_common.h>

diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c
index b06b84c315e73aef668fecc8c9b3b3c5a381fb73..a46e8438f7c2bf91ae0cc65bed98bfaf1d7941bf 100644 (file)
--- a/arch/arm/mach-stm32mp/cpu.c
+++ b/arch/arm/mach-stm32mp/cpu.c
@@ -6,7 +6,6 @@
 #include <clk.h>
 #include <debug_uart.h>
 #include <env.h>
-#include <environment.h>
 #include <misc.h>
 #include <asm/io.h>
 #include <asm/arch/stm32.h>

diff --git a/arch/arm/mach-tegra/cboot.c b/arch/arm/mach-tegra/cboot.c
index bd4f33686da02a4f69de14ece05a7ee142994589..0433081c6c55ce69925441a32f37946bac0919fd 100644 (file)
--- a/arch/arm/mach-tegra/cboot.c
+++ b/arch/arm/mach-tegra/cboot.c
@@ -5,7 +5,6 @@
 
 #include <common.h>
 #include <env.h>
-#include <environment.h>
 #include <fdt_support.h>
 #include <fdtdec.h>
 #include <stdlib.h>

diff --git a/arch/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c
index 5b7a68b2501ead6247add5e1a900832c3235bf02..19445b3fc7a56c4ac78d57af4d721ff2b7688c6c 100644 (file)
--- a/arch/m68k/lib/bootm.c
+++ b/arch/m68k/lib/bootm.c
@@ -11,7 +11,6 @@
 #include <u-boot/zlib.h>
 #include <bzlib.h>
 #include <watchdog.h>
-#include <environment.h>
 #include <asm/byteorder.h>
 #ifdef CONFIG_SHOW_BOOT_PROGRESS
 # include <status_led.h>

diff --git a/arch/nds32/include/asm/u-boot.h b/arch/nds32/include/asm/u-boot.h
index 68701d6da9a5ff04b6927ba8076fd6e497e7a792..8c949e7fb71dba21c3837689156d7b22e3daab89 100644 (file)
--- a/arch/nds32/include/asm/u-boot.h
+++ b/arch/nds32/include/asm/u-boot.h
@@ -21,7 +21,6 @@
 
 #include <asm/u-boot-nds32.h>
 
-#include <environment.h>
 
 typedef struct bd_info {
        unsigned long   bi_arch_number; /* unique id for this board */

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

diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index 52bcd4e6f1623249eeb3a468de5e7144cbc065dc..84691b75546390ee97ea31af1506de2b34a7407d 100644 (file)
--- a/arch/powerpc/lib/bootm.c
+++ b/arch/powerpc/lib/bootm.c
@@ -15,7 +15,6 @@
 #include <malloc.h>
 #include <u-boot/zlib.h>
 #include <bzlib.h>
-#include <environment.h>
 #include <asm/byteorder.h>
 #include <asm/mp.h>
 #include <bootm.h>

diff --git a/arch/riscv/include/asm/u-boot.h b/arch/riscv/include/asm/u-boot.h
index 3186835e0ad789f79844aabba3c99a1dd680c3a9..5ba8e77812863289e95823df47a8f9f0ac133e5a 100644 (file)
--- a/arch/riscv/include/asm/u-boot.h
+++ b/arch/riscv/include/asm/u-boot.h
@@ -20,7 +20,6 @@
 
 #include <asm/u-boot-riscv.h>
 
-#include <environment.h>
 
 typedef struct bd_info {
        unsigned long   bi_boot_params; /* where this board expects params */

diff --git a/board/Arcturus/ucp1020/cmd_arc.c b/board/Arcturus/ucp1020/cmd_arc.c
index 755f569d13166526e14aee80a5653ac1240f30af..2e8477ed3b7a01a205aa460fc32aeee155291bb2 100644 (file)
--- a/board/Arcturus/ucp1020/cmd_arc.c
+++ b/board/Arcturus/ucp1020/cmd_arc.c
@@ -15,7 +15,6 @@
 #include <spi_flash.h>
 #include <mmc.h>
 #include <version.h>
-#include <environment.h>
 #include <asm/io.h>
 
 static ulong fwenv_addr[MAX_FWENV_ADDR];

diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
index f3c89d63d5430cfc0addfc374eae3f146bd957a7..946e20ab492f8990c38fd76ac103563be97bf8be 100644 (file)
--- a/board/CZ.NIC/turris_mox/turris_mox.c
+++ b/board/CZ.NIC/turris_mox/turris_mox.c
@@ -15,7 +15,6 @@
 #include <linux/string.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
-#include <environment.h>
 
 #include "mox_sp.h"
 

diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c
index 418657c2d572514f49ea7c9ce400a261d8d5e422..1d8d08a847d9104356b3763248be95fd8beac2cf 100644 (file)
--- a/board/CZ.NIC/turris_omnia/turris_omnia.c
+++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
@@ -9,7 +9,6 @@
 
 #include <common.h>
 #include <env.h>
-#include <environment.h>
 #include <i2c.h>
 #include <miiphy.h>
 #include <netdev.h>

diff --git a/board/LaCie/net2big_v2/net2big_v2.c b/board/LaCie/net2big_v2/net2big_v2.c
index 1609089502c12fd0d6b35796f05978133ffbee98..686608d25a5aa63a0b7dfbbd8349e87a0f67896c 100644 (file)
--- a/board/LaCie/net2big_v2/net2big_v2.c
+++ b/board/LaCie/net2big_v2/net2big_v2.c
@@ -11,7 +11,6 @@
 #include <common.h>
 #include <command.h>
 #include <env.h>
-#include <environment.h>
 #include <i2c.h>
 #include <asm/mach-types.h>
 #include <asm/arch/cpu.h>

diff --git a/board/LaCie/netspace_v2/netspace_v2.c b/board/LaCie/netspace_v2/netspace_v2.c
index ba667934e4219b6e121159cf8100d7ea5110e92e..bd7ab22948b220608322b94fa9bf0d051b774a78 100644 (file)
--- a/board/LaCie/netspace_v2/netspace_v2.c
+++ b/board/LaCie/netspace_v2/netspace_v2.c
@@ -11,7 +11,6 @@
 #include <common.h>
 #include <command.h>
 #include <env.h>
-#include <environment.h>
 #include <asm/mach-types.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>

diff --git a/board/amlogic/p200/p200.c b/board/amlogic/p200/p200.c
index 7f33ce0f0bb318bd215137412969fc1570d3fb18..41d331dda2d4acc5fa51714b87efce4b5d8d0f59 100644 (file)
--- a/board/amlogic/p200/p200.c
+++ b/board/amlogic/p200/p200.c
@@ -6,7 +6,6 @@
 #include <common.h>
 #include <dm.h>
 #include <env.h>
-#include <environment.h>
 #include <asm/io.h>
 #include <asm/arch/gx.h>
 #include <asm/arch/sm.h>

diff --git a/board/amlogic/p201/p201.c b/board/amlogic/p201/p201.c
index 0a17fbedf1d44a50374a7842d9cecf6be1a9605f..e46fcaea6dcda73a22bade2a87645f5ae48fcea2 100644 (file)
--- a/board/amlogic/p201/p201.c
+++ b/board/amlogic/p201/p201.c
@@ -6,7 +6,6 @@
 #include <common.h>
 #include <dm.h>
 #include <env.h>
-#include <environment.h>
 #include <asm/io.h>
 #include <asm/arch/gx.h>
 #include <asm/arch/sm.h>

diff --git a/board/amlogic/p212/p212.c b/board/amlogic/p212/p212.c
index 4d6ac7264ccde6ab1b69ad7aeb5865684f3242bb..094ab5478d0034a2fb5a8fbba0eff9e697855820 100644 (file)
--- a/board/amlogic/p212/p212.c
+++ b/board/amlogic/p212/p212.c
@@ -7,7 +7,6 @@
 #include <common.h>
 #include <dm.h>
 #include <env.h>
-#include <environment.h>
 #include <asm/io.h>
 #include <asm/arch/gx.h>
 #include <asm/arch/sm.h>

diff --git a/board/amlogic/q200/q200.c b/board/amlogic/q200/q200.c
index 880945f143b1198d4ded2d8809fb758eeea48913..f1faa7418e07004fbd77ed2bd6acfb9f454cd801 100644 (file)
--- a/board/amlogic/q200/q200.c
+++ b/board/amlogic/q200/q200.c
@@ -7,7 +7,6 @@
 #include <common.h>
 #include <dm.h>
 #include <env.h>
-#include <environment.h>
 #include <asm/io.h>
 #include <asm/arch/gx.h>
 #include <asm/arch/mem.h>

diff --git a/board/amlogic/s400/s400.c b/board/amlogic/s400/s400.c
index 02a0e9286cb15c889d180667c9b8f710fcf23ff7..bdb4eca8839e8bffa38bb34ec7209ea3c32cfcf3 100644 (file)
--- a/board/amlogic/s400/s400.c
+++ b/board/amlogic/s400/s400.c
@@ -6,7 +6,6 @@
 
 #include <common.h>
 #include <dm.h>
-#include <environment.h>
 #include <asm/io.h>
 #include <asm/arch/axg.h>
 #include <asm/arch/sm.h>

diff --git a/board/amlogic/u200/u200.c b/board/amlogic/u200/u200.c
index 94ee3ce6e45b022de15a7ed61c1689a6be167e29..69fd29d4fecc6cee6f4c27134eb5a41def7af783 100644 (file)
--- a/board/amlogic/u200/u200.c
+++ b/board/amlogic/u200/u200.c
@@ -6,7 +6,6 @@
 
 #include <common.h>
 #include <dm.h>
-#include <environment.h>
 #include <asm/io.h>
 #include <asm/arch/axg.h>
 #include <asm/arch/sm.h>

diff --git a/board/armadeus/apf27/apf27.c b/board/armadeus/apf27/apf27.c
index bf2586d326aa9845e7976476ab00d1e445416cb5..20be0c3bd4ef7dad734f010c2ac680d9df87072d 100644 (file)
--- a/board/armadeus/apf27/apf27.c
+++ b/board/armadeus/apf27/apf27.c
@@ -7,7 +7,6 @@
  */
 
 #include <common.h>
-#include <environment.h>
 #include <jffs2/jffs2.h>
 #include <nand.h>
 #include <netdev.h>

diff --git a/board/atmel/common/mac_eeprom.c b/board/atmel/common/mac_eeprom.c
index f016ef7a6a7bd63766497d5d18a70f4b62768732..83a7778e99546876dc2b8976bd1939829967c71c 100644 (file)
--- a/board/atmel/common/mac_eeprom.c
+++ b/board/atmel/common/mac_eeprom.c
@@ -7,7 +7,6 @@
 #include <common.h>
 #include <dm.h>
 #include <env.h>
-#include <environment.h>
 #include <i2c_eeprom.h>
 #include <netdev.h>
 

diff --git a/board/birdland/bav335x/board.c b/board/birdland/bav335x/board.c
index b0339ad8f0240b5f1e42bb71c02985fb327adb13..9e64cbbc827b760d7f9790540fd328f4690415a8 100644 (file)
--- a/board/birdland/bav335x/board.c
+++ b/board/birdland/bav335x/board.c
@@ -30,7 +30,6 @@
 #include <power/tps65910.h>
 #include <environment.h>
 #include <watchdog.h>
-#include <environment.h>
 #include "board.h"
 
 DECLARE_GLOBAL_DATA_PTR;

diff --git a/board/bosch/guardian/board.c b/board/bosch/guardian/board.c
index 86ab180f5cdb962cd437b27d0961eea070241928..bc3c6d229c2abcaba839c7545e7171ac7f14ae29 100644 (file)
--- a/board/bosch/guardian/board.c
+++ b/board/bosch/guardian/board.c
@@ -12,7 +12,6 @@
 #include <cpsw.h>
 #include <dm.h>
 #include <environment.h>
-#include <environment.h>
 #include <errno.h>
 #include <i2c.h>
 #include <miiphy.h>

diff --git a/board/bosch/shc/board.c b/board/bosch/shc/board.c
index 29be3739f914a317561bba78fe6bd301767dd19b..358118f75774e77902e6140b7515b1fe88c56a71 100644 (file)
--- a/board/bosch/shc/board.c
+++ b/board/bosch/shc/board.c
@@ -33,7 +33,6 @@
 #include <power/tps65217.h>
 #include <environment.h>
 #include <watchdog.h>
-#include <environment.h>
 #include "mmc.h"
 #include "board.h"
 

diff --git a/board/compulab/cl-som-imx7/cl-som-imx7.c b/board/compulab/cl-som-imx7/cl-som-imx7.c
index 6cc7554c1a46d3798f23ecbcae681a881cc529c0..395d5dce17854488fc71ea99ac980adeb5bfbb87 100644 (file)
--- a/board/compulab/cl-som-imx7/cl-som-imx7.c
+++ b/board/compulab/cl-som-imx7/cl-som-imx7.c
@@ -9,7 +9,6 @@
 
 #include <common.h>
 #include <env.h>
-#include <environment.h>
 #include <mmc.h>
 #include <phy.h>
 #include <netdev.h>

diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index 57bbe41b8c9da1968239f27ebb88ab87d13721bc..feb7a71f007d64ff6b78d2ee3f8dbb39977d8f5c 100644 (file)
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -12,7 +12,6 @@
 #include <dm.h>
 #include <dwc_ahsata.h>
 #include <env.h>
-#include <environment.h>
 #include <fsl_esdhc_imx.h>
 #include <miiphy.h>
 #include <mtd_node.h>

diff --git a/board/compulab/cm_t335/cm_t335.c b/board/compulab/cm_t335/cm_t335.c
index fca7685ca7ae4350083a02ee8e4b25dbc4ced534..6e38745191c0f6e19d2e73974dbf3fe715dd3bc9 100644 (file)
--- a/board/compulab/cm_t335/cm_t335.c
+++ b/board/compulab/cm_t335/cm_t335.c
@@ -9,7 +9,6 @@
 
 #include <common.h>
 #include <env.h>
-#include <environment.h>
 #include <errno.h>
 #include <miiphy.h>
 #include <cpsw.h>

diff --git a/board/compulab/cm_t35/cm_t35.c b/board/compulab/cm_t35/cm_t35.c
index ead470064636e3a2eb43837c6c86e405bdcb82ec..b52358baacd860ac674a979947b44e8eaf3e9087 100644 (file)
--- a/board/compulab/cm_t35/cm_t35.c
+++ b/board/compulab/cm_t35/cm_t35.c
@@ -13,7 +13,6 @@
 
 #include <common.h>
 #include <env.h>
-#include <environment.h>
 #include <status_led.h>
 #include <netdev.h>
 #include <net.h>

diff --git a/board/compulab/cm_t54/cm_t54.c b/board/compulab/cm_t54/cm_t54.c
index d7c59d5a32afd5b9bfa9246ba1da68bb6f1d3c03..811bbb528a82d1abc9ebc0439ea0796f4375035f 100644 (file)
--- a/board/compulab/cm_t54/cm_t54.c
+++ b/board/compulab/cm_t54/cm_t54.c
@@ -9,7 +9,6 @@
 
 #include <common.h>
 #include <env.h>
-#include <environment.h>
 #include <fdt_support.h>
 #include <usb.h>
 #include <mmc.h>

diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c
index d3f3819f112933a6749bbfc04ba9fd5ae134b9dd..d9019de6e0066353672ed7d08fc679793a2717f9 100644 (file)
--- a/board/davinci/da8xxevm/da850evm.c
+++ b/board/davinci/da8xxevm/da850evm.c
@@ -11,7 +11,6 @@
 #include <common.h>
 #include <dm.h>
 #include <env.h>
-#include <environment.h>
 #include <i2c.h>
 #include <net.h>
 #include <spi.h>

diff --git a/board/dhelectronics/dh_imx6/dh_imx6.c b/board/dhelectronics/dh_imx6/dh_imx6.c
index 1994dec8f99c41c3fafa2fd72dc9cc98f6a6b43e..2d0f78da118f512a2f6296cb4ed240ae4f45d297 100644 (file)
--- a/board/dhelectronics/dh_imx6/dh_imx6.c
+++ b/board/dhelectronics/dh_imx6/dh_imx6.c
@@ -22,7 +22,6 @@
 #include <ahci.h>
 #include <dwc_ahsata.h>
 #include <env.h>
-#include <environment.h>
 #include <errno.h>
 #include <fsl_esdhc_imx.h>
 #include <fuse.h>

diff --git a/board/eets/pdu001/board.c b/board/eets/pdu001/board.c
index 74a66842748d1ffd41c842a218d7b6951fd33e69..8a3d0ada270e8c9038e7c70fedb81f481b97307b 100644 (file)
--- a/board/eets/pdu001/board.c
+++ b/board/eets/pdu001/board.c
@@ -14,7 +14,6 @@
 #include <errno.h>
 #include <spl.h>
 #include <i2c.h>
-#include <environment.h>
 #include <watchdog.h>
 #include <debug_uart.h>
 #include <dm/ofnode.h>

diff --git a/board/freescale/imx8qm_mek/imx8qm_mek.c b/board/freescale/imx8qm_mek/imx8qm_mek.c
index f4b0ffc59deae0239f19d73704654227cd0edd91..76634a3a28ad9cc0ffd80d3a1a2e84741ce95750 100644 (file)
--- a/board/freescale/imx8qm_mek/imx8qm_mek.c
+++ b/board/freescale/imx8qm_mek/imx8qm_mek.c
@@ -7,7 +7,6 @@
 #include <env.h>
 #include <errno.h>
 #include <linux/libfdt.h>
-#include <environment.h>
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/arch/clock.h>

diff --git a/board/freescale/imx8qxp_mek/imx8qxp_mek.c b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
index 26bbbca8fc68d4c56509ea2b1cc16a208d76612f..4ba83142841a23c0672620e193e08a4165f8b985 100644 (file)
--- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c
+++ b/board/freescale/imx8qxp_mek/imx8qxp_mek.c
@@ -7,7 +7,6 @@
 #include <env.h>
 #include <errno.h>
 #include <linux/libfdt.h>
-#include <environment.h>
 #include <fsl_esdhc_imx.h>
 #include <asm/io.h>
 #include <asm/gpio.h>

diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
index 3c40a4a8922476b09f09446b369fa0cc8f8782a4..8a694a71c90bcc10f6c980085f51f73fecb93786 100644 (file)
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -22,7 +22,6 @@
 #include <dm.h>
 #include <dm/platform_data/serial_mxc.h>
 #include <env.h>
-#include <environment.h>
 #include <hwconfig.h>
 #include <i2c.h>
 #include <fdt_support.h>

diff --git a/board/gateworks/gw_ventana/gw_ventana_spl.c b/board/gateworks/gw_ventana/gw_ventana_spl.c
index 6886ff9b33baf4e25b216e6946dbb4edd5a47d19..b0891379a170f7d87667a554eff9014fe1595e0c 100644 (file)
--- a/board/gateworks/gw_ventana/gw_ventana_spl.c
+++ b/board/gateworks/gw_ventana/gw_ventana_spl.c
@@ -15,7 +15,6 @@
 #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/ge/mx53ppd/mx53ppd.c b/board/ge/mx53ppd/mx53ppd.c
index aadf4668d98ce2eb981abc263b94b0a7305a3b6b..544856729821b7931ee70c23f08b27e88c6bd835 100644 (file)
--- a/board/ge/mx53ppd/mx53ppd.c
+++ b/board/ge/mx53ppd/mx53ppd.c
@@ -21,7 +21,6 @@
 #include <linux/libfdt.h>
 #include <asm/mach-imx/mxc_i2c.h>
 #include <asm/mach-imx/mx5_video.h>
-#include <environment.h>
 #include <netdev.h>
 #include <i2c.h>
 #include <mmc.h>

diff --git a/board/grinn/chiliboard/board.c b/board/grinn/chiliboard/board.c
index 6b9e6e9a0984128e27b446daa9e56d14f0b22d3e..c6d53600fa1c6e74eb006947e204594284b8ea1a 100644 (file)
--- a/board/grinn/chiliboard/board.c
+++ b/board/grinn/chiliboard/board.c
@@ -17,7 +17,6 @@
 #include <asm/io.h>
 #include <cpsw.h>
 #include <env.h>
-#include <environment.h>
 #include <errno.h>
 #include <miiphy.h>
 #include <spl.h>

diff --git a/board/gumstix/pepper/board.c b/board/gumstix/pepper/board.c
index 7ae4c5cd77fd3e3af735630064a4f6e396c6610f..f5beb8c940ee6805a8353c4a7d636243a7f81fe8 100644 (file)
--- a/board/gumstix/pepper/board.c
+++ b/board/gumstix/pepper/board.c
@@ -26,7 +26,6 @@
 #include <miiphy.h>
 #include <cpsw.h>
 #include <power/tps65217.h>
-#include <environment.h>
 #include <watchdog.h>
 #include "board.h"
 

diff --git a/board/imgtec/ci20/ci20.c b/board/imgtec/ci20/ci20.c
index f72a660581cccb9ec168dc9e961f7ea40d334a4a..5368b67b38b669c75175d3dce44d7ed67380c8ac 100644 (file)
--- a/board/imgtec/ci20/ci20.c
+++ b/board/imgtec/ci20/ci20.c
@@ -8,7 +8,6 @@
 
 #include <common.h>
 #include <env.h>
-#include <environment.h>
 #include <net.h>
 #include <netdev.h>
 #include <asm/io.h>

diff --git a/board/intel/edison/edison.c b/board/intel/edison/edison.c
index f8f498d088472a13e45eac6a186af82f9a301b09..f56b5b1affefa8ca27763584f03ed7bbd6ae13af 100644 (file)
--- a/board/intel/edison/edison.c
+++ b/board/intel/edison/edison.c
@@ -5,7 +5,6 @@
 #include <common.h>
 #include <dwc3-uboot.h>
 #include <env.h>
-#include <environment.h>
 #include <mmc.h>
 #include <u-boot/md5.h>
 #include <usb.h>

diff --git a/board/isee/igep003x/board.c b/board/isee/igep003x/board.c
index 398c945990919f307bb5f1031a4d266b1bdf8f95..a8c2b121a476ca5935916719d605c5cafe4beb4b 100644 (file)
--- a/board/isee/igep003x/board.c
+++ b/board/isee/igep003x/board.c
@@ -26,7 +26,6 @@
 #include <fdt_support.h>
 #include <mtd_node.h>
 #include <jffs2/load_kernel.h>
-#include <environment.h>
 #include "board.h"
 
 DECLARE_GLOBAL_DATA_PTR;

diff --git a/board/k+p/kp_imx53/kp_id_rev.c b/board/k+p/kp_imx53/kp_id_rev.c
index 642adf78d8c29c6caf632af61fda84dcc8fa6192..9dae54dda5fc6a3d41e20e1ea8dd2fd26f43c5dd 100644 (file)
--- a/board/k+p/kp_imx53/kp_id_rev.c
+++ b/board/k+p/kp_imx53/kp_id_rev.c
@@ -11,7 +11,6 @@
 
 #include <common.h>
 #include <env.h>
-#include <environment.h>
 #include <i2c.h>
 #include "kp_id_rev.h"
 

diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c
index e0f0d7c60c01c2d36e659bcaf0b60b3e283b8492..b7b747d196583f812195ec999e34c3e8135fcc52 100644 (file)
--- a/board/kosagi/novena/novena.c
+++ b/board/kosagi/novena/novena.c
@@ -25,7 +25,6 @@
 #include <asm/mach-imx/sata.h>
 #include <asm/mach-imx/video.h>
 #include <dwc_ahsata.h>
-#include <environment.h>
 #include <fsl_esdhc_imx.h>
 #include <i2c.h>
 #include <input.h>

diff --git a/board/liebherr/display5/display5.c b/board/liebherr/display5/display5.c
index 5c70e1b6f28cf67fcb0ffbef5b4eba9f61df35d3..037c4e69e59cbaeeaa4af29d1487896aea41a047 100644 (file)
--- a/board/liebherr/display5/display5.c
+++ b/board/liebherr/display5/display5.c
@@ -26,7 +26,6 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <i2c.h>
-#include <environment.h>
 
 #include <dm.h>
 #include <dm/platform_data/serial_mxc.h>

diff --git a/board/liebherr/display5/spl.c b/board/liebherr/display5/spl.c
index d92760b4870d372fb9616f1587e9306a32991384..354b63e431f687d862b646bbf44fdb5e79559d36 100644 (file)
--- a/board/liebherr/display5/spl.c
+++ b/board/liebherr/display5/spl.c
@@ -18,7 +18,6 @@
 #include "asm/arch/iomux.h"
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/gpio.h>
-#include <environment.h>
 #include <fsl_esdhc_imx.h>
 #include <netdev.h>
 #include <bootcount.h>

diff --git a/board/logicpd/zoom1/zoom1.c b/board/logicpd/zoom1/zoom1.c
index 54716125f38f4b83432331019ea0304f7d84d0fb..6bfa41737f6b7e199a6b20626a102614142c5e09 100644 (file)
--- a/board/logicpd/zoom1/zoom1.c
+++ b/board/logicpd/zoom1/zoom1.c
@@ -16,7 +16,6 @@
 #include <common.h>
 #include <dm.h>
 #include <env.h>
-#include <environment.h>
 #include <ns16550.h>
 #include <netdev.h>
 #include <twl4030.h>

diff --git a/board/mscc/ocelot/ocelot.c b/board/mscc/ocelot/ocelot.c
index bcae8fa50ca2b5bce19621af0e6fc095230a38d0..91d03951dbbebc604d121871bf930b8be667ebd0 100644 (file)
--- a/board/mscc/ocelot/ocelot.c
+++ b/board/mscc/ocelot/ocelot.c
@@ -7,7 +7,6 @@
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
-#include <environment.h>
 #include <spi.h>
 #include <led.h>
 #include <wait_bit.h>

diff --git a/board/nvidia/p2371-2180/p2371-2180.c b/board/nvidia/p2371-2180/p2371-2180.c
index b1da5c9982d0f8b0f5447ba9d9e205e3d0923aa2..fa5288bf18595f62c8501642a7fcbb3fda164eb6 100644 (file)
--- a/board/nvidia/p2371-2180/p2371-2180.c
+++ b/board/nvidia/p2371-2180/p2371-2180.c
@@ -6,7 +6,6 @@
 
 #include <common.h>
 #include <env.h>
-#include <environment.h>
 #include <fdtdec.h>
 #include <i2c.h>
 #include <linux/libfdt.h>

diff --git a/board/nvidia/p2771-0000/p2771-0000.c b/board/nvidia/p2771-0000/p2771-0000.c
index 8c91b75f9677c4ea5d35681cde48fbee7f508d48..63cdb3a604b8014281af66dc79eda1f6c27d9582 100644 (file)
--- a/board/nvidia/p2771-0000/p2771-0000.c
+++ b/board/nvidia/p2771-0000/p2771-0000.c
@@ -5,7 +5,6 @@
 
 #include <common.h>
 #include <env.h>
-#include <environment.h>
 #include <fdtdec.h>
 #include <i2c.h>
 #include <linux/libfdt.h>

diff --git a/board/phytec/pcm051/board.c b/board/phytec/pcm051/board.c
index 0cb85e940c40a5dec6f2f4a05337d31b0402ba68..43f6c5afcb8ce872b3ed9bae73b15dd77d401dbc 100644 (file)
--- a/board/phytec/pcm051/board.c
+++ b/board/phytec/pcm051/board.c
@@ -10,7 +10,6 @@
 
 #include <common.h>
 #include <env.h>
-#include <environment.h>
 #include <errno.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>

diff --git a/board/phytec/pcm052/pcm052.c b/board/phytec/pcm052/pcm052.c
index 2417111765f882ec512df35e721137c797e1ecd5..e1ebe8e75d008db4dcdf0c38985ae49f4d517221 100644 (file)
--- a/board/phytec/pcm052/pcm052.c
+++ b/board/phytec/pcm052/pcm052.c
@@ -15,7 +15,6 @@
 #include <asm/arch/clock.h>
 #include <env.h>
 #include <led.h>
-#include <environment.h>
 #include <miiphy.h>
 
 DECLARE_GLOBAL_DATA_PTR;

diff --git a/board/phytec/phycore_rk3288/phycore-rk3288.c b/board/phytec/phycore_rk3288/phycore-rk3288.c
index 9f945e829d8e6e58223554474f5a9a3d4aa0cf62..7b9178e3a69c469d8c511c1ee59ea58388880311 100644 (file)
--- a/board/phytec/phycore_rk3288/phycore-rk3288.c
+++ b/board/phytec/phycore_rk3288/phycore-rk3288.c
@@ -9,7 +9,6 @@
 #include <dm.h>
 #include <env.h>
 #include <environment.h>
-#include <fdtdec.h>
 #include <i2c.h>
 #include <i2c_eeprom.h>
 #include <netdev.h>

diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c
index 06d3d7e0f85b23147cab838d6485a8bc3fd4c4c2..d7f0f93fb109113e64ca414c156e1bbbb3d46f12 100644 (file)
--- a/board/qualcomm/dragonboard410c/dragonboard410c.c
+++ b/board/qualcomm/dragonboard410c/dragonboard410c.c
@@ -11,7 +11,6 @@
 #include <usb.h>
 #include <asm/gpio.h>
 #include <fdt_support.h>
-#include <environment.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/misc.h>
 

diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index 104589bff16b7cc98c7b6b5e8d05d0aaa589ed17..7a6ca8f759e66d0e987ac3a51e75be71852fdebd 100644 (file)
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -7,7 +7,6 @@
 #include <config.h>
 #include <dm.h>
 #include <env.h>
-#include <environment.h>
 #include <efi_loader.h>
 #include <fdt_support.h>
 #include <fdt_simplefb.h>

diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c
index 898abfbd85f709f041e008dd82761e9cd023ebff..08c544860953fc9c34cbcac343b343f2c5199a01 100644 (file)
--- a/board/renesas/blanche/blanche.c
+++ b/board/renesas/blanche/blanche.c
@@ -19,7 +19,6 @@
 #include <dm.h>
 #include <dm/platform_data/serial_sh.h>
 #include <env.h>
-#include <environment.h>
 #include <i2c.h>
 #include <linux/errno.h>
 #include <malloc.h>

diff --git a/board/renesas/sh7752evb/sh7752evb.c b/board/renesas/sh7752evb/sh7752evb.c
index b14ce263f789905277d5b239da889b074a1fa5e6..d0b850f35d4914531034a8047c5dfc48d52fbf92 100644 (file)
--- a/board/renesas/sh7752evb/sh7752evb.c
+++ b/board/renesas/sh7752evb/sh7752evb.c
@@ -5,7 +5,6 @@
 
 #include <common.h>
 #include <env.h>
-#include <environment.h>
 #include <malloc.h>
 #include <asm/processor.h>
 #include <asm/io.h>

diff --git a/board/renesas/sh7753evb/sh7753evb.c b/board/renesas/sh7753evb/sh7753evb.c
index f643867806b3179208dc19b035033f3d65b35908..e1bed7dcc3717be68b2c3b48642380653f94ecec 100644 (file)
--- a/board/renesas/sh7753evb/sh7753evb.c
+++ b/board/renesas/sh7753evb/sh7753evb.c
@@ -5,7 +5,6 @@
 
 #include <common.h>
 #include <env.h>
-#include <environment.h>
 #include <malloc.h>
 #include <asm/processor.h>
 #include <asm/io.h>

diff --git a/board/renesas/sh7757lcr/sh7757lcr.c b/board/renesas/sh7757lcr/sh7757lcr.c
index 2d32440aeb3b43c90d33d67ce8ba45e49f04b038..d2671202e98182ba95234276eddac2881a74991b 100644 (file)
--- a/board/renesas/sh7757lcr/sh7757lcr.c
+++ b/board/renesas/sh7757lcr/sh7757lcr.c
@@ -5,7 +5,6 @@
 
 #include <common.h>
 #include <env.h>
-#include <environment.h>
 #include <malloc.h>
 #include <asm/processor.h>
 #include <asm/io.h>

diff --git a/board/rockchip/tinker_rk3288/tinker-rk3288.c b/board/rockchip/tinker_rk3288/tinker-rk3288.c
index e379950095b902733080788a812a4dedaa3428a1..6c76c3c25c4d644a5f6c2c27357dec7d6f56b4a8 100644 (file)
--- a/board/rockchip/tinker_rk3288/tinker-rk3288.c
+++ b/board/rockchip/tinker_rk3288/tinker-rk3288.c
@@ -6,7 +6,6 @@
 #include <common.h>
 #include <dm.h>
 #include <env.h>
-#include <environment.h>
 #include <i2c_eeprom.h>
 #include <netdev.h>
 

diff --git a/board/samtec/vining_fpga/socfpga.c b/board/samtec/vining_fpga/socfpga.c
index 63ce4a20b5d17b20620aac77f8933742cee27a8b..1e095a4e7db0feeabcaf6a37ca9a0ffa02217a7a 100644 (file)
--- a/board/samtec/vining_fpga/socfpga.c
+++ b/board/samtec/vining_fpga/socfpga.c
@@ -5,7 +5,6 @@
 
 #include <common.h>
 #include <env.h>
-#include <environment.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/io.h>
 #include <asm/gpio.h>

diff --git a/board/siemens/common/factoryset.c b/board/siemens/common/factoryset.c
index cd224a8e1c1782a71b9a7467a0880da8eb848f12..049a65ff778f6617c0b7435159a2b606741f47fa 100644 (file)
--- a/board/siemens/common/factoryset.c
+++ b/board/siemens/common/factoryset.c
@@ -9,7 +9,6 @@
 
 #include <common.h>
 #include <env.h>
-#include <environment.h>
 #include <i2c.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>

diff --git a/board/siemens/pxm2/board.c b/board/siemens/pxm2/board.c
index 0a82a5ef5c53b15c71853011a9ed049ffed15c66..30f0902701ee466eacd5f67f2a33125d7a81fb0f 100644 (file)
--- a/board/siemens/pxm2/board.c
+++ b/board/siemens/pxm2/board.c
@@ -14,7 +14,6 @@
 
 #include <common.h>
 #include <env.h>
-#include <environment.h>
 #include <errno.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>

diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c
index d0efb67bbc19082b2bcef3fbf2af6a3670488c66..1cf1f9e1f7cadba9ccc006b164f4aa30e307e59e 100644 (file)
--- a/board/siemens/taurus/taurus.c
+++ b/board/siemens/taurus/taurus.c
@@ -15,7 +15,6 @@
 #include <common.h>
 #include <dm.h>
 #include <env.h>
-#include <environment.h>
 #include <asm/io.h>
 #include <asm/arch/at91sam9260_matrix.h>
 #include <asm/arch/at91sam9_smc.h>

diff --git a/board/silica/pengwyn/board.c b/board/silica/pengwyn/board.c
index dc10b76160afc4e45af0ef0197921ff4d866f2be..345701fd52c61055b05f3df56d28fe5eb1b374a1 100644 (file)
--- a/board/silica/pengwyn/board.c
+++ b/board/silica/pengwyn/board.c
@@ -7,7 +7,6 @@
 
 #include <common.h>
 #include <env.h>
-#include <environment.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/ddr_defs.h>

diff --git a/board/softing/vining_2000/vining_2000.c b/board/softing/vining_2000/vining_2000.c
index d1df8fc0cc6b9cdc5c2ea1ed692f956c744d8de8..51985b91c2261e214f235ca0b305bdecb153c190 100644 (file)
--- a/board/softing/vining_2000/vining_2000.c
+++ b/board/softing/vining_2000/vining_2000.c
@@ -19,7 +19,6 @@
 #include <env.h>
 #include <linux/sizes.h>
 #include <common.h>
-#include <environment.h>
 #include <fsl_esdhc_imx.h>
 #include <mmc.h>
 #include <i2c.h>

diff --git a/board/tcl/sl50/board.c b/board/tcl/sl50/board.c
index 8ddbee543636409dc1b8b9832292463c90284787..a9c9d377b4fc937cc9d352a5abaae53bbe0edd9c 100644 (file)
--- a/board/tcl/sl50/board.c
+++ b/board/tcl/sl50/board.c
@@ -30,7 +30,6 @@
 #include <power/tps65910.h>
 #include <environment.h>
 #include <watchdog.h>
-#include <environment.h>
 #include "board.h"
 
 DECLARE_GLOBAL_DATA_PTR;

diff --git a/board/technologic/ts4800/ts4800.c b/board/technologic/ts4800/ts4800.c
index 38d3a3de26eddd2e236bfd9222284ab083c5d0ae..82eb0c285cc17c567afbd7cc14ddf4eab8fe51c1 100644 (file)
--- a/board/technologic/ts4800/ts4800.c
+++ b/board/technologic/ts4800/ts4800.c
@@ -17,7 +17,6 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/clock.h>
 #include <asm/mach-imx/mx5_video.h>
-#include <environment.h>
 #include <mmc.h>
 #include <input.h>
 #include <fsl_esdhc_imx.h>

diff --git a/board/theobroma-systems/puma_rk3399/puma-rk3399.c b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
index a00587c3fa46046a5b74533ed27eae711ff99243..4113a1c6ee03767726ce199fa9393b6794c6213f 100644 (file)
--- a/board/theobroma-systems/puma_rk3399/puma-rk3399.c
+++ b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
@@ -6,7 +6,6 @@
 #include <common.h>
 #include <dm.h>
 #include <env.h>
-#include <environment.h>
 #include <misc.h>
 #include <spl.h>
 #include <syscon.h>

diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index 58d09f7c20f7d4af4108dc10f6a6c99a7a6f5265..54adcd510de49a5d68c505b0b74d650a552123b2 100644 (file)
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -36,7 +36,6 @@
 #include <power/tps65910.h>
 #include <environment.h>
 #include <watchdog.h>
-#include <environment.h>
 #include "../common/board_detect.h"
 #include "board.h"
 

diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c
index 756b516aa6b896c9cee09257fa249b56b54fb127..2e09cc20e8c2d6df6978e094c2ad9257c2a067fc 100644 (file)
--- a/board/ti/am43xx/board.c
+++ b/board/ti/am43xx/board.c
@@ -9,7 +9,6 @@
 
 #include <common.h>
 #include <env.h>
-#include <environment.h>
 #include <i2c.h>
 #include <linux/errno.h>
 #include <spl.h>

diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index 0dacfd43277e8ae12c4883accbdde9ff7a3d632e..f78e6c2e1f6e2706aca87444000d26ea09720621 100644 (file)
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -24,7 +24,6 @@
 #include <asm/arch/sata.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/omap.h>
-#include <environment.h>
 #include <usb.h>
 #include <linux/usb/gadget.h>
 #include <dwc3-uboot.h>

diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c
index 97eef65d51af99b535c9a118afd3c257aa173477..74d04bb1e393adb1641bb1f04b8702e51596f710 100644 (file)
--- a/board/ti/dra7xx/evm.c
+++ b/board/ti/dra7xx/evm.c
@@ -25,7 +25,6 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/sata.h>
-#include <environment.h>
 #include <dwc3-uboot.h>
 #include <dwc3-omap-uboot.h>
 #include <i2c.h>

diff --git a/board/ti/ti814x/evm.c b/board/ti/ti814x/evm.c
index a4c094b6dc2cbc68137fc2cb78694218b2ed3972..2b9385d14b43ca36945ed003e34e9f0a0b6f61c2 100644 (file)
--- a/board/ti/ti814x/evm.c
+++ b/board/ti/ti814x/evm.c
@@ -10,7 +10,6 @@
 #include <common.h>
 #include <cpsw.h>
 #include <env.h>
-#include <environment.h>
 #include <errno.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>

diff --git a/board/ti/ti816x/evm.c b/board/ti/ti816x/evm.c
index de9e91a685b9f22aadaeab1ece2223ed4fae3013..8f7b591b5c46415a978ec5f33a43938fd0c3a3a8 100644 (file)
--- a/board/ti/ti816x/evm.c
+++ b/board/ti/ti816x/evm.c
@@ -8,7 +8,6 @@
 
 #include <common.h>
 #include <env.h>
-#include <environment.h>
 #include <spl.h>
 #include <asm/cache.h>
 #include <asm/io.h>

diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c
index f8970b0b6dd426a79f6e410441a79d1656174806..490d8cbcd061f6b56024aff51db8d4a47814546f 100644 (file)
--- a/board/timll/devkit8000/devkit8000.c
+++ b/board/timll/devkit8000/devkit8000.c
@@ -18,7 +18,6 @@
 #include <common.h>
 #include <dm.h>
 #include <env.h>
-#include <environment.h>
 #include <ns16550.h>
 #include <twl4030.h>
 #include <asm/io.h>

diff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c
index a770472e17f9320c43efe0b8fa965a5e4511d569..af48b560952eb3c2ceb3ae1dde8cee106453ecf4 100644 (file)
--- a/board/toradex/apalis-imx8/apalis-imx8.c
+++ b/board/toradex/apalis-imx8/apalis-imx8.c
@@ -13,7 +13,6 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <env.h>
-#include <environment.h>
 #include <errno.h>
 #include <linux/libfdt.h>
 

diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c
index 89f1b728fd41d528615c54c8eed0391ed17c1f8e..6421a22c25a7a29ee15827398b0c73c38bca2ffc 100644 (file)
--- a/board/toradex/apalis_imx6/apalis_imx6.c
+++ b/board/toradex/apalis_imx6/apalis_imx6.c
@@ -27,7 +27,6 @@
 #include <dm/platform_data/serial_mxc.h>
 #include <dwc_ahsata.h>
 #include <env.h>
-#include <environment.h>
 #include <fsl_esdhc_imx.h>
 #include <imx_thermal.h>
 #include <micrel.h>

diff --git a/board/toradex/colibri-imx8x/colibri-imx8x.c b/board/toradex/colibri-imx8x/colibri-imx8x.c
index 69628b906cf76ceea108f509f44edcf656de680d..eae3c591a16464698792e5fb623d8a01bf2e9ad0 100644 (file)
--- a/board/toradex/colibri-imx8x/colibri-imx8x.c
+++ b/board/toradex/colibri-imx8x/colibri-imx8x.c
@@ -13,7 +13,6 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <env.h>
-#include <environment.h>
 #include <errno.h>
 #include <linux/libfdt.h>
 

diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c
index f657db87d8f117be0c93e9e30bd97c20efe6581a..ad40b589c1ed17ac89a984f369e50682ae147588 100644 (file)
--- a/board/toradex/colibri_imx6/colibri_imx6.c
+++ b/board/toradex/colibri_imx6/colibri_imx6.c
@@ -25,7 +25,6 @@
 #include <asm/mach-imx/video.h>
 #include <cpu.h>
 #include <dm/platform_data/serial_mxc.h>
-#include <environment.h>
 #include <fsl_esdhc_imx.h>
 #include <imx_thermal.h>
 #include <micrel.h>

diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c
index 71642a13ea162eadf8ccabb1b543a3b590f8c48a..e9441a7979d2195b8ed9053af9a09b7689b4014f 100644 (file)
--- a/board/toradex/common/tdx-common.c
+++ b/board/toradex/common/tdx-common.c
@@ -5,7 +5,6 @@
 
 #include <common.h>
 #include <env.h>
-#include <environment.h>
 #include <g_dnl.h>
 #include <linux/libfdt.h>
 

diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c
index 5f5a51bfbf57a369e62d07737ed227b18d63410f..f5540841c9ff0347284879bbc460dfa306ca3e88 100644 (file)
--- a/board/vscom/baltos/board.c
+++ b/board/vscom/baltos/board.c
@@ -29,7 +29,6 @@
 #include <miiphy.h>
 #include <cpsw.h>
 #include <power/tps65910.h>
-#include <environment.h>
 #include <watchdog.h>
 #include "board.h"
 

diff --git a/cmd/aes.c b/cmd/aes.c
index 25efb9642a2b23f30dbe56d236a9675af54c2d9c..7ff4a7170934a4a0e9a3ddba5f8c8bf127cfdf28 100644 (file)
--- a/cmd/aes.c
+++ b/cmd/aes.c
@@ -7,7 +7,6 @@
 
 #include <common.h>
 #include <command.h>
-#include <environment.h>
 #include <uboot_aes.h>
 #include <malloc.h>
 #include <asm/byteorder.h>

diff --git a/cmd/blob.c b/cmd/blob.c
index d3b6e454bf46d61b4ccd9c9fae47b19434903c77..80478b8802daa24d56c7f81793fa1d082207c8b1 100644 (file)
--- a/cmd/blob.c
+++ b/cmd/blob.c
@@ -6,7 +6,6 @@
 
 #include <common.h>
 #include <command.h>
-#include <environment.h>
 #include <malloc.h>
 #include <asm/byteorder.h>
 #include <linux/compiler.h>

diff --git a/cmd/bootm.c b/cmd/bootm.c
index b326ac9b431a7616ef354caa2301da66d341d636..8279f2b7cc632f14f7cf2155583dfb0710797cfa 100644 (file)
--- a/cmd/bootm.c
+++ b/cmd/bootm.c
@@ -11,7 +11,6 @@
 #include <bootm.h>
 #include <command.h>
 #include <env.h>
-#include <environment.h>
 #include <errno.h>
 #include <image.h>
 #include <malloc.h>

diff --git a/cmd/efidebug.c b/cmd/efidebug.c
index 961e8fad22be51b320bcfbf886937302db402142..ef97e19d0735851f9fbdb93ee4910a53041b33b1 100644 (file)
--- a/cmd/efidebug.c
+++ b/cmd/efidebug.c
@@ -9,7 +9,6 @@
 #include <common.h>
 #include <command.h>
 #include <efi_loader.h>
-#include <environment.h>
 #include <exports.h>
 #include <hexdump.h>
 #include <malloc.h>

diff --git a/cmd/elf.c b/cmd/elf.c
index 5e5cf47cf894a7c55811ec5861732473549271bb..538562fda581ba6b6978199db8e8a2ae1f8f5231 100644 (file)
--- a/cmd/elf.c
+++ b/cmd/elf.c
@@ -17,7 +17,6 @@
 #include <command.h>
 #include <elf.h>
 #include <env.h>
-#include <environment.h>
 #include <net.h>
 #include <vxworks.h>
 #ifdef CONFIG_X86

diff --git a/cmd/ethsw.c b/cmd/ethsw.c
index 473324f878287f84395bc8b4066c02e25cfabb0a..884680579975f6911bfdfb3b713b93c91e2f090f 100644 (file)
--- a/cmd/ethsw.c
+++ b/cmd/ethsw.c
@@ -7,7 +7,7 @@
 
 #include <common.h>
 #include <command.h>
-#include <environment.h>
+#include <env.h>
 #include <errno.h>
 #include <env_flags.h>
 #include <ethsw.h>

diff --git a/cmd/i2c.c b/cmd/i2c.c
index 09c4ba9a1c752f48f6b0b5d293be0f6b80f639b8..e0f8ece597c556d518697ff91d610632d1c3e2e0 100644 (file)
--- a/cmd/i2c.c
+++ b/cmd/i2c.c
@@ -71,7 +71,6 @@
 #include <console.h>
 #include <dm.h>
 #include <edid.h>
-#include <environment.h>
 #include <errno.h>
 #include <i2c.h>
 #include <malloc.h>

diff --git a/cmd/ini.c b/cmd/ini.c
index f4faa7cae1b2bc3fb8dc0024726de98ef914df13..0c425262d0e77df77d912f705d9d93c21c317b7c 100644 (file)
--- a/cmd/ini.c
+++ b/cmd/ini.c
@@ -14,7 +14,6 @@
 #include <common.h>
 #include <command.h>
 #include <env.h>
-#include <environment.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 

diff --git a/cmd/tpm_test.c b/cmd/tpm_test.c
index 56a5aa4aa5ead0b6c913250903eeae0a590bd698..c14dd75a260914583b11351c2b7fce079cc03421 100644 (file)
--- a/cmd/tpm_test.c
+++ b/cmd/tpm_test.c
@@ -5,7 +5,6 @@
 
 #include <common.h>
 #include <command.h>
-#include <environment.h>
 #include <tpm-v1.h>
 #include "tpm-user-utils.h"
 

diff --git a/common/image.c b/common/image.c
index 4a578f3ef083b34250e1887a25860669cacbc2a6..84e859a30f455c184ecc4997b584e7c958c5fc4f 100644 (file)
--- a/common/image.c
+++ b/common/image.c
@@ -17,7 +17,6 @@
 
 #include <rtc.h>
 
-#include <environment.h>
 #include <gzip.h>
 #include <image.h>
 #include <mapmem.h>

diff --git a/common/spl/spl_dfu.c b/common/spl/spl_dfu.c
index 3f54ae02601980ff384b4172c4aeb1ade164c3f9..5728d43ad3f29f664502e48ca415809328811a39 100644 (file)
--- a/common/spl/spl_dfu.c
+++ b/common/spl/spl_dfu.c
@@ -15,7 +15,6 @@
 #include <g_dnl.h>
 #include <usb.h>
 #include <dfu.h>
-#include <environment.h>
 
 static int run_dfu(int usb_index, char *interface, char *devstring)
 {

diff --git a/drivers/bootcount/bootcount_env.c b/drivers/bootcount/bootcount_env.c
index 50e0857b3bf26f102c3087b37065acaf7ec2597a..b75c9002b2c0a7ffb532570a9af13aa637ffcf22 100644 (file)
--- a/drivers/bootcount/bootcount_env.c
+++ b/drivers/bootcount/bootcount_env.c
@@ -6,7 +6,6 @@
 
 #include <common.h>
 #include <env.h>
-#include <environment.h>
 
 void bootcount_store(ulong a)
 {

diff --git a/drivers/mtd/jedec_flash.c b/drivers/mtd/jedec_flash.c
index a3540c11152f6c5e9cbb5df874e6dfdc3d8fb1ce..f59b2bc62fba010e6d4778b2262bb91055c8d028 100644 (file)
--- a/drivers/mtd/jedec_flash.c
+++ b/drivers/mtd/jedec_flash.c
@@ -15,7 +15,6 @@
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/byteorder.h>
-#include <environment.h>
 
 #define P_ID_AMD_STD CFI_CMDSET_AMD_LEGACY
 

diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index a8b141aba2bd0cf0020489e2e3c0531c7b306c3b..080dbcf7db4463704866091c0ef23b9928cc932b 100644 (file)
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -10,7 +10,6 @@
 #include <common.h>
 #include <dm.h>
 #include <env.h>
-#include <environment.h>
 #include <malloc.h>
 #include <memalign.h>
 #include <miiphy.h>

diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c
index ce0f1678fd0be22c12d6dc511bb1a17d9312d214..4c9dce8dc57bc6a47739d0088a1b4d318e674f91 100644 (file)
--- a/drivers/net/fm/fm.c
+++ b/drivers/net/fm/fm.c
@@ -15,7 +15,6 @@
 #include <nand.h>
 #include <spi_flash.h>
 #include <mmc.h>
-#include <environment.h>
 
 #ifdef CONFIG_ARM64
 #include <asm/armv8/mmu.h>

diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c
index 41752c0b6af362b2442680e1a2c3141c0ecd6250..e66fb16de8720e10556dc4b30640cb2abbf576a7 100644 (file)
--- a/drivers/net/fsl_mcdmafec.c
+++ b/drivers/net/fsl_mcdmafec.c
@@ -9,7 +9,6 @@
 
 #include <common.h>
 #include <env.h>
-#include <environment.h>
 #include <malloc.h>
 #include <command.h>
 #include <config.h>

diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c
index a8553cbbc2f02d4119c01be7d617703bf8031c76..fb930412569c0c46b5ba6b53599a5248668c7bb0 100644 (file)
--- a/drivers/net/mcffec.c
+++ b/drivers/net/mcffec.c
@@ -9,7 +9,6 @@
 
 #include <common.h>
 #include <env.h>
-#include <environment.h>
 #include <malloc.h>
 
 #include <command.h>

diff --git a/drivers/net/ne2000_base.c b/drivers/net/ne2000_base.c
index 3bc7a35086d8fd0edb1967682b345deaae6fff66..819a24607007d5cf1e27c16d2a4c93d7b260adb9 100644 (file)
--- a/drivers/net/ne2000_base.c
+++ b/drivers/net/ne2000_base.c
@@ -75,7 +75,6 @@ Add SNMP
 #include <common.h>
 #include <command.h>
 #include <env.h>
-#include <environment.h>
 #include <net.h>
 #include <malloc.h>
 #include <linux/compiler.h>

diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index e2ca4749f7006ca66c8ccad57ce26d8dc41c8c04..749f651920828955b5be7469e26fd4c16a1b9fee 100644 (file)
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -11,7 +11,6 @@
 #include <config.h>
 #include <common.h>
 #include <env.h>
-#include <environment.h>
 #include <malloc.h>
 #include <net.h>
 #include <netdev.h>

diff --git a/drivers/net/ti/cpsw-common.c b/drivers/net/ti/cpsw-common.c
index ac12cfe9b86bd989777943915c5e1f34f94d7a00..21b8bbda3d5b61cd900642c5c9cf0fc109c8a347 100644 (file)
--- a/drivers/net/ti/cpsw-common.c
+++ b/drivers/net/ti/cpsw-common.c
@@ -7,7 +7,6 @@
 
 #include <common.h>
 #include <dm.h>
-#include <environment.h>
 #include <fdt_support.h>
 #include <asm/io.h>
 #include <cpsw.h>

diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c
index 505ae9b45fb431fcc6c5560695b3463995495bbe..6e4d732a07a4f6e990f9e175925fd5ec4fdc04e3 100644 (file)
--- a/drivers/qe/qe.c
+++ b/drivers/qe/qe.c
@@ -14,7 +14,6 @@
 #include <linux/immap_qe.h>
 #include <fsl_qe.h>
 #include <mmc.h>
-#include <environment.h>
 
 #ifdef CONFIG_ARCH_LS1021A
 #include <asm/arch/immap_ls102xa.h>

diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index fa49d3126f0c760024247abe86888966e21014c8..a118283984c2d2e58226a93a2d26c11f58f71b8d 100644 (file)
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -10,7 +10,6 @@
 #include <common.h>
 #include <console.h>
 #include <env.h>
-#include <environment.h>
 #include <linux/errno.h>
 #include <linux/netdevice.h>
 #include <linux/usb/ch9.h>

diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index f75ca1a67c98a0ba4b9e6f7fc10d15ef0d1ea2ae..b9bff894cbba0be5fc43c515fb2e7f6ef0a25d04 100644 (file)
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -8,7 +8,6 @@
 #include <common.h>
 #include <div64.h>
 #include <efi_loader.h>
-#include <environment.h>
 #include <malloc.h>
 #include <linux/libfdt_env.h>
 #include <u-boot/crc.h>

diff --git a/net/eth-uclass.c b/net/eth-uclass.c
index 4e4f47243123e12fc643f2e18e509f31b2f44479..1d5d2f03b7d946f989dadfcb852d6d62576c4693 100644 (file)
--- a/net/eth-uclass.c
+++ b/net/eth-uclass.c
@@ -8,7 +8,6 @@
 #include <common.h>
 #include <dm.h>
 #include <env.h>
-#include <environment.h>
 #include <net.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>

diff --git a/net/eth_common.c b/net/eth_common.c
index dcc59186d89dd2a3c26e8530b37b2979838a08d2..ed26b1b69359aae191481f058db7e99fa8c329b5 100644 (file)
--- a/net/eth_common.c
+++ b/net/eth_common.c
@@ -8,7 +8,6 @@
 #include <common.h>
 #include <dm.h>
 #include <env.h>
-#include <environment.h>
 #include <miiphy.h>
 #include <net.h>
 #include "eth_internal.h"

diff --git a/net/eth_legacy.c b/net/eth_legacy.c
index 0f558b23ce147fd66cda804337c4c8aa9609c5ee..850f362d873e2930da2d0e42bf77f5412c5b64cc 100644 (file)
--- a/net/eth_legacy.c
+++ b/net/eth_legacy.c
@@ -8,7 +8,6 @@
 #include <common.h>
 #include <command.h>
 #include <env.h>
-#include <environment.h>
 #include <net.h>
 #include <phy.h>
 #include <linux/errno.h>

diff --git a/net/wol.c b/net/wol.c
index 51543343e409a6807b7b56448413bf204ca9fc49..0a625668a992ef4fd6feb8c8cf4084b6020ccfd8 100644 (file)
--- a/net/wol.c
+++ b/net/wol.c
@@ -7,7 +7,6 @@
 #include <command.h>
 #include <env.h>
 #include <net.h>
-#include <environment.h>
 #include "wol.h"
 
 static ulong wol_timeout = WOL_DEFAULT_TIMEOUT;