global: Avoid indirect inclusion of <env.h> from <net.h>

Now that env_get_ip() has been removed, the include file <net.h> does
not need anything from <env.h>. Furthermore, include/env.h itself
includes other headers which can lead to longer indirect inclusion
paths. To prepare to remove <env.h> from <net.h> fix all of the
remaining places which had relied on this indirect inclusion to instead
include <env.h> directly.

Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org> # net/lwip
Acked-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Reviewed-by: Wolfgang Wallner <wolfgang.wallner@br-automation.com>
Reviewed-by: Martyn Welch <martyn.welch@collabora.com>
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/board/BuR/brppt2/board.c b/board/BuR/brppt2/board.c
index c0a163251b46431cdeca5e3fc84f60f9287d6c5b..de206bdf1bc480ffa8cd900c203d9b994cc08703 100644 (file)
--- a/board/BuR/brppt2/board.c
+++ b/board/BuR/brppt2/board.c
@@ -7,6 +7,7 @@
  *
  */
 #include <cpu_func.h>
+#include <env.h>
 #include <hang.h>
 #include <init.h>
 #include <spl.h>

diff --git a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c
index b9f47006d610b64c002ba424c48ff7928871c15d..8c9e98308765c0b3d70d22337fbf6a654c408d03 100644 (file)
--- a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c
+++ b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c
@@ -7,6 +7,7 @@
 #include <dwc3-uboot.h>
 #include <efi.h>
 #include <efi_loader.h>
+#include <env.h>
 #include <errno.h>
 #include <miiphy.h>
 #include <netdev.h>

diff --git a/board/andestech/ae350/ae350.c b/board/andestech/ae350/ae350.c
index 1d9d4a929c226573e479bc95783e0418169c08da..9bdd2ab1780560e4756efe45bd27768f1e6b0b43 100644 (file)
--- a/board/andestech/ae350/ae350.c
+++ b/board/andestech/ae350/ae350.c
@@ -6,6 +6,7 @@
 
 #include <config.h>
 #include <cpu_func.h>
+#include <env.h>
 #include <flash.h>
 #include <image.h>
 #include <init.h>

diff --git a/board/data_modul/common/common.c b/board/data_modul/common/common.c
index 9e35dc5d6cb125e3190a0c79293ceba76c730981..7d344792937e9b91617051cb51676b585f4818d6 100644 (file)
--- a/board/data_modul/common/common.c
+++ b/board/data_modul/common/common.c
@@ -12,6 +12,7 @@
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <dm/uclass.h>
+#include <env.h>
 #include <hang.h>
 #include <i2c_eeprom.h>
 #include <image.h>

diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
index 21a908c20dd52517b05feef58b1589d652f8eba9..457d8281a664139581093291da6d250ebe5f82ed 100644 (file)
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -6,6 +6,7 @@
  */
 
 #include <command.h>
+#include <env.h>
 #include <fdt_support.h>
 #include <gsc.h>
 #include <hwconfig.h>

diff --git a/board/ge/b1x5v2/b1x5v2.c b/board/ge/b1x5v2/b1x5v2.c
index c1aacd1458b10117fe61c28e868e19b1f301dad3..ddb7304d493ae58861942c24772ba99995710ab3 100644 (file)
--- a/board/ge/b1x5v2/b1x5v2.c
+++ b/board/ge/b1x5v2/b1x5v2.c
@@ -17,6 +17,7 @@
 #include <asm/io.h>
 #include <asm/mach-imx/video.h>
 #include <command.h>
+#include <env.h>
 #include <i2c.h>
 #include <input.h>
 #include <ipu_pixfmt.h>

diff --git a/board/keymile/kmcent2/kmcent2.c b/board/keymile/kmcent2/kmcent2.c
index 783853d5c6f63220cd11c3c718689864dda8cd78..0f43ebfec4d5e83100b26eab9ef8b904239e3974 100644 (file)
--- a/board/keymile/kmcent2/kmcent2.c
+++ b/board/keymile/kmcent2/kmcent2.c
@@ -6,6 +6,7 @@
  * Copyright 2013 Freescale Semiconductor, Inc.
  */
 
+#include <env.h>
 #include <event.h>
 #include <asm/cache.h>
 #include <asm/fsl_fdt.h>

diff --git a/board/purism/librem5/librem5.c b/board/purism/librem5/librem5.c
index 8ca8792fa422cb04b82df0a33f39aef65bcf558f..5178ee6929d8f7c278c8c9a8beb0541982c4ae0f 100644 (file)
--- a/board/purism/librem5/librem5.c
+++ b/board/purism/librem5/librem5.c
@@ -6,6 +6,7 @@
 
 #include <malloc.h>
 #include <errno.h>
+#include <env.h>
 #include <asm/io.h>
 #include <miiphy.h>
 #include <asm/mach-imx/iomux-v3.h>

diff --git a/board/siemens/iot2050/board.c b/board/siemens/iot2050/board.c
index d827f728a08c427612b46139e12d714fbfae48f2..161210c60a963be8f655680bef6cf6ae2a60a2c0 100644 (file)
--- a/board/siemens/iot2050/board.c
+++ b/board/siemens/iot2050/board.c
@@ -11,6 +11,7 @@
 #include <config.h>
 #include <bootstage.h>
 #include <dm.h>
+#include <env.h>
 #include <fdt_support.h>
 #include <i2c.h>
 #include <led.h>

diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c
index 0525f6e6f9793209b94d25c53e47fdda46233682..b1ed29af0018b45108e293f92b59e526bd6fa730 100644 (file)
--- a/board/ti/j721e/evm.c
+++ b/board/ti/j721e/evm.c
@@ -8,6 +8,7 @@
  */
 
 #include <efi_loader.h>
+#include <env.h>
 #include <generic-phy.h>
 #include <image.h>
 #include <net.h>

diff --git a/boot/bootmeth_efi.c b/boot/bootmeth_efi.c
index 0c9b4c3d59dc6505c05ccf5c2fdd02f401a0f048..0af23df3a4a551adc230469041eadac885be7424 100644 (file)
--- a/boot/bootmeth_efi.c
+++ b/boot/bootmeth_efi.c
@@ -15,6 +15,7 @@
 #include <dm.h>
 #include <efi.h>
 #include <efi_loader.h>
+#include <env.h>
 #include <fs.h>
 #include <malloc.h>
 #include <mapmem.h>

diff --git a/boot/bootmeth_pxe.c b/boot/bootmeth_pxe.c
index 6e5e0f99ea42a148d5f1512e2ec6b0d0ff0d9915..faa8d729b1513fb9f7d1c97456813c268ed5d96c 100644 (file)
--- a/boot/bootmeth_pxe.c
+++ b/boot/bootmeth_pxe.c
@@ -13,6 +13,7 @@
 #include <bootmeth.h>
 #include <command.h>
 #include <dm.h>
+#include <env.h>
 #include <extlinux.h>
 #include <fs.h>
 #include <log.h>

diff --git a/cmd/pxe.c b/cmd/pxe.c
index 0f26b3b421971943e64ab79384aeeec111f5834c..e82247af6c07eb22ada79ff00aa0de3298aa98ab 100644 (file)
--- a/cmd/pxe.c
+++ b/cmd/pxe.c
@@ -5,6 +5,7 @@
  */
 
 #include <command.h>
+#include <env.h>
 #include <fs.h>
 #include <net.h>
 #include <net6.h>

diff --git a/drivers/net/pfe_eth/pfe_firmware.c b/drivers/net/pfe_eth/pfe_firmware.c
index da4f2ca42a5ba97b71a1591d9afa58981369e9fa..b821fb17a1d66edaee6a400af3aa5826d466ec32 100644 (file)
--- a/drivers/net/pfe_eth/pfe_firmware.c
+++ b/drivers/net/pfe_eth/pfe_firmware.c
@@ -12,6 +12,7 @@
 
 #include <dm.h>
 #include <dm/device-internal.h>
+#include <env.h>
 #include <image.h>
 #include <log.h>
 #include <malloc.h>

diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c
index c0df5cb9acd99a5ecaf1107d7d8aed7356318b5f..298149bcc3322a7d568a7ad50f968bb3fc35d883 100644 (file)
--- a/lib/efi_loader/efi_bootmgr.c
+++ b/lib/efi_loader/efi_bootmgr.c
@@ -12,6 +12,7 @@
 #include <charset.h>
 #include <dm.h>
 #include <efi.h>
+#include <env.h>
 #include <log.h>
 #include <malloc.h>
 #include <net.h>

diff --git a/lib/efi_loader/efi_net.c b/lib/efi_loader/efi_net.c
index b3291b4f1d527aa09d9953b4e32d24a4930a31b0..9db738ead9dd535a1fdeb574243bb51807ebdb74 100644 (file)
--- a/lib/efi_loader/efi_net.c
+++ b/lib/efi_loader/efi_net.c
@@ -18,6 +18,7 @@
 #define LOG_CATEGORY LOGC_EFI
 
 #include <efi_loader.h>
+#include <env.h>
 #include <dm.h>
 #include <linux/sizes.h>
 #include <malloc.h>

diff --git a/net/lwip/dhcp.c b/net/lwip/dhcp.c
index 92bd7067a7fb4f2ba53fd4dff47de351f72c94b3..043d2ab6e946e15737a6c321c6d157cb9771efce 100644 (file)
--- a/net/lwip/dhcp.c
+++ b/net/lwip/dhcp.c
@@ -3,6 +3,7 @@
 
 #include <command.h>
 #include <console.h>
+#include <env.h>
 #include <log.h>
 #include <dm/device.h>
 #include <linux/delay.h>

diff --git a/net/lwip/dns.c b/net/lwip/dns.c
index 19172ac959acdc34346bdc9844e537e7d1a83f6f..6862869d9e30ce33bfc7c667c782c0f33788190a 100644 (file)
--- a/net/lwip/dns.c
+++ b/net/lwip/dns.c
@@ -3,6 +3,7 @@
 
 #include <command.h>
 #include <console.h>
+#include <env.h>
 #include <lwip/dns.h>
 #include <lwip/timeouts.h>
 #include <net.h>

diff --git a/net/lwip/net-lwip.c b/net/lwip/net-lwip.c
index f05c4cd3f64f37a665d92d43230520fb9e5ae6c6..abc52b32049cdd186657b625f9d1b155dcdda520 100644 (file)
--- a/net/lwip/net-lwip.c
+++ b/net/lwip/net-lwip.c
@@ -3,6 +3,7 @@
 /* Copyright (C) 2024 Linaro Ltd. */
 
 #include <command.h>
+#include <env.h>
 #include <dm/device.h>
 #include <dm/uclass.h>
 #include <hexdump.h>

diff --git a/net/lwip/tftp.c b/net/lwip/tftp.c
index 4f9b2049187c5b841bbf82718e5a4008763d04c9..56d27f8212122eaa9c41c944b81ecb3ded58053f 100644 (file)
--- a/net/lwip/tftp.c
+++ b/net/lwip/tftp.c
@@ -6,6 +6,7 @@
 #include <display_options.h>
 #include <dm/device.h>
 #include <efi_loader.h>
+#include <env.h>
 #include <image.h>
 #include <linux/delay.h>
 #include <lwip/apps/tftp_client.h>

diff --git a/net/lwip/wget.c b/net/lwip/wget.c
index a3b82908877f357e29f4e65d7e31a8df7a55ddd7..46c16edcc44033a6c8dac095bdf0befb4be326da 100644 (file)
--- a/net/lwip/wget.c
+++ b/net/lwip/wget.c
@@ -5,6 +5,7 @@
 #include <console.h>
 #include <display_options.h>
 #include <efi_loader.h>
+#include <env.h>
 #include <image.h>
 #include <lwip/apps/http_client.h>
 #include "lwip/altcp_tls.h"

diff --git a/test/dm/dsa.c b/test/dm/dsa.c
index 9a31ae39d95227a7408ebef08f3f7ad9b65e3c57..46e48741fbaa7420f047d4872f47c91d3f8b0bfc 100644 (file)
--- a/test/dm/dsa.c
+++ b/test/dm/dsa.c
@@ -3,6 +3,7 @@
  * Copyright 2020-2021 NXP
  */
 
+#include <env.h>
 #include <net/dsa.h>
 #include <dm/test.h>
 #include <test/ut.h>