From: Tom Rini <trini@konsulko.com>
Date: Thu, 29 May 2025 14:31:07 +0000 (-0600)
Subject: Merge patch series "Remove <env.h> from <net.h>"
X-Git-Tag: v2025.10-rc1~118^2~65
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=62905f4a929b476761caff1078c88e1d3216b175;p=thirdparty%2Fu-boot.git

Merge patch series "Remove <env.h> from <net.h>"

Tom Rini <trini@konsulko.com> says:

Hey all,

This is a v3 of Simon's series[1] and depends on the series[2] I posted
the other day that removes <env.h> from <command.h>. With this series
done, I believe we've tackled all of the current cases of headers which
include <env.h> without directly needing it. Much of this series is in
fact Simon's v2 with the main differneces being:
- Removing <env.h> from <net.h> at the end
- Removing env_to_ip() given how little it's used rather than shuffling
  around where it's declared and un-inline'ing it. For a rarely used
  helper, this ends up being cleaner I think. Especially looking at some
  of the users (which called env_get repeatedly). If there's strong
  opinion here about using the other method[3] we can do that instead.
- Setting aside for now how to handle CMD_ELF=y and NO_NET=y because
  today it's actually fine as we unconditionally build lib/net_utils.c
  where string_to_ip() is defined. I'm unsure if a further series is
  warranted here or not. We rely on link-time optimization to keep code
  readable too.

[1]: https://lore.kernel.org/all/20250501010456.3930701-1-sjg@chromium.org
[2]: https://lore.kernel.org/all/20250514225002.15361-1-trini@konsulko.com
[3]: https://lore.kernel.org/all/20250501010456.3930701-23-sjg@chromium.org
Link: https://lore.kernel.org/r/20250515234154.1859366-1-trini@konsulko.com
---

62905f4a929b476761caff1078c88e1d3216b175
diff --cc lib/efi_loader/efi_bootmgr.c
index 1a3461f5a9d,298149bcc33..b9437a81c64
--- a/lib/efi_loader/efi_bootmgr.c
+++ b/lib/efi_loader/efi_bootmgr.c
@@@ -12,7 -12,7 +12,8 @@@
  #include <charset.h>
  #include <dm.h>
  #include <efi.h>
 +#include <efi_device_path.h>
+ #include <env.h>
  #include <log.h>
  #include <malloc.h>
  #include <net.h>
diff --cc lib/efi_loader/efi_net.c
index 8e708d8d350,9db738ead9d..86f0af9538c
--- a/lib/efi_loader/efi_net.c
+++ b/lib/efi_loader/efi_net.c
@@@ -17,8 -17,8 +17,9 @@@
  
  #define LOG_CATEGORY LOGC_EFI
  
 +#include <efi_device_path.h>
  #include <efi_loader.h>
+ #include <env.h>
  #include <dm.h>
  #include <linux/sizes.h>
  #include <malloc.h>
diff --cc net/lwip/tftp.c
index fae701bad2e,56d27f82121..b7eb486ef77
--- a/net/lwip/tftp.c
+++ b/net/lwip/tftp.c
@@@ -6,9 -6,9 +6,10 @@@
  #include <display_options.h>
  #include <dm/device.h>
  #include <efi_loader.h>
+ #include <env.h>
  #include <image.h>
  #include <linux/delay.h>
 +#include <linux/kconfig.h>
  #include <lwip/apps/tftp_client.h>
  #include <lwip/timeouts.h>
  #include <mapmem.h>
diff --cc net/lwip/wget.c
index ea1113e18b1,46c16edcc44..f4fd9718285
--- a/net/lwip/wget.c
+++ b/net/lwip/wget.c
@@@ -5,11 -5,10 +5,12 @@@
  #include <console.h>
  #include <display_options.h>
  #include <efi_loader.h>
+ #include <env.h>
  #include <image.h>
 +#include <linux/kconfig.h>
  #include <lwip/apps/http_client.h>
  #include "lwip/altcp_tls.h"
 +#include <lwip/errno.h>
  #include <lwip/timeouts.h>
  #include <rng.h>
  #include <mapmem.h>