commit c31301cde444ada21eea345aae7d53c98f6fec25
author Tom Rini <trini@konsulko.com> Thu May 15 17:31:50 2025 -0600
committer Tom Rini <trini@konsulko.com> Thu May 29 08:30:25 2025 -0600
tree c946d2d89d2d99a21d6aacf7370ed26688cbfbde
parent eac1bb375aef67050b5c9536bf8c552287163287

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>

net/lwip/dhcp.c

diff --git a/net/lwip/dhcp.c b/net/lwip/dhcp.c
index 92bd706..043d2ab 100644
--- 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>

net/lwip/dns.c

diff --git a/net/lwip/dns.c b/net/lwip/dns.c
index 19172ac..6862869 100644
--- 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>

net/lwip/net-lwip.c

diff --git a/net/lwip/net-lwip.c b/net/lwip/net-lwip.c
index f05c4cd..abc52b3 100644
--- 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>

net/lwip/tftp.c

diff --git a/net/lwip/tftp.c b/net/lwip/tftp.c
index 4f9b204..56d27f8 100644
--- 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>

net/lwip/wget.c

diff --git a/net/lwip/wget.c b/net/lwip/wget.c
index a3b8290..46c16ed 100644
--- 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"