From: Tom Rini <trini@konsulko.com>
Date: Tue, 31 Mar 2026 16:47:15 +0000 (-0600)
Subject: Merge tag 'net-20260331' of https://source.denx.de/u-boot/custodians/u-boot-net into... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98cf83d81617f489d7ff7bf78d33e693e2799254;p=thirdparty%2Fu-boot.git

Merge tag 'net-20260331' of https://source.denx.de/u-boot/custodians/u-boot-net into next

Pull request net-20260331.

net:
- airoha_eth & pcs_airoha driver fixes
- Rework some symbol dependencies
- dwc_eth_xgmac: Move DMA reset and pad calibration after PHY init
- rtl8169: add support for RTL8125d
- rswitch: Avoid NULL pointer dereference during PHY access
- rswitch: Remap CPU to bus addresses using dev_phys_to_bus()
- phy: dp83867: reset PHY on init to ensure clean state

net-lwip:
- nfs: fix buffer overflow when using symlinks
- tftp: update image_load_addr after successful transfer

[trini: Add missing "if NET" to CMD_DHCP select's CMD_BOOTP]
Signed-off-by: Tom Rini <trini@konsulko.com>
---

98cf83d81617f489d7ff7bf78d33e693e2799254
diff --cc cmd/Kconfig
index a96d6472359,81c64d9ba85..effc209f38e
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@@ -2195,6 -2195,7 +2195,7 @@@ endif  # if NE
  config CMD_DHCP
  	bool "dhcp"
  	select PROT_DHCP_LWIP if NET_LWIP
 -	select CMD_BOOTP
++	select CMD_BOOTP if NET
  	help
  	  Boot image via network using DHCP/TFTP protocol