Merge tag 'v2024.07-rc3' into next

Prepare v2024.07-rc3

26 files changed, 26 insertions, 3 deletions

diff --git a/net/arp.c b/net/arp.c
index bc1e25f941f..37848ad32fb 100644
--- a/net/arp.c
+++ b/net/arp.c
@@ -9,10 +9,10 @@
  *	Copyright 2000-2002 Wolfgang Denk, wd@denx.de
  */
 
+#include <common.h>
 #include <env.h>
 #include <log.h>
 #include <net.h>
-#include <vsprintf.h>
 #include <linux/delay.h>
 
 #include "arp.h"
diff --git a/net/bootp.c b/net/bootp.c
index 9dfb50749b4..86c56803c76 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -8,6 +8,7 @@
  *	Copyright 2000-2004 Wolfgang Denk, wd@denx.de
  */
 
+#include <common.h>
 #include <bootstage.h>
 #include <command.h>
 #include <env.h>
diff --git a/net/cdp.c b/net/cdp.c
index d4cfc587ee3..a8f890e7522 100644
--- a/net/cdp.c
+++ b/net/cdp.c
@@ -9,6 +9,7 @@
  *	Copyright 2000-2002 Wolfgang Denk, wd@denx.de
  */
 
+#include <common.h>
 #include <net.h>
 
 #include "cdp.h"
diff --git a/net/dhcpv6.c b/net/dhcpv6.c
index 54619ee6983..4aea779f6f2 100644
--- a/net/dhcpv6.c
+++ b/net/dhcpv6.c
@@ -7,6 +7,7 @@
 
 /* Simple DHCP6 network layer implementation. */
 
+#include <common.h>
 #include <net6.h>
 #include <malloc.h>
 #include <linux/delay.h>
diff --git a/net/dns.c b/net/dns.c
index c2f0ab98c8d..5b1fe5b0103 100644
--- a/net/dns.c
+++ b/net/dns.c
@@ -22,6 +22,7 @@
  * this stuff is worth it, you can buy me a beer in return.
  */
 
+#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <log.h>
diff --git a/net/eth-uclass.c b/net/eth-uclass.c
index e34d7af0229..193218a328b 100644
--- a/net/eth-uclass.c
+++ b/net/eth-uclass.c
@@ -7,6 +7,7 @@
 
 #define LOG_CATEGORY UCLASS_ETH
 
+#include <common.h>
 #include <bootdev.h>
 #include <bootstage.h>
 #include <dm.h>
diff --git a/net/eth_bootdev.c b/net/eth_bootdev.c
index 6ee54e3c790..869adf8cbbd 100644
--- a/net/eth_bootdev.c
+++ b/net/eth_bootdev.c
@@ -8,6 +8,7 @@
 
 #define LOG_CATEGORY UCLASS_BOOTSTD
 
+#include <common.h>
 #include <bootdev.h>
 #include <bootflow.h>
 #include <command.h>
diff --git a/net/eth_common.c b/net/eth_common.c
index 89b5bb37189..14d4c07b695 100644
--- a/net/eth_common.c
+++ b/net/eth_common.c
@@ -5,6 +5,7 @@
  * Joe Hershberger, National Instruments
  */
 
+#include <common.h>
 #include <bootstage.h>
 #include <dm.h>
 #include <env.h>
diff --git a/net/fastboot_tcp.c b/net/fastboot_tcp.c
index d1fccbc7238..2eb52ea2567 100644
--- a/net/fastboot_tcp.c
+++ b/net/fastboot_tcp.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2023 The Android Open Source Project
  */
 
+#include <common.h>
 #include <fastboot.h>
 #include <net.h>
 #include <net/fastboot_tcp.h>
diff --git a/net/fastboot_udp.c b/net/fastboot_udp.c
index d1479510d61..6fee441ab3b 100644
--- a/net/fastboot_udp.c
+++ b/net/fastboot_udp.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2016 The Android Open Source Project
  */
 
+#include <common.h>
 #include <command.h>
 #include <fastboot.h>
 #include <net.h>
diff --git a/net/link_local.c b/net/link_local.c
index 179721333ff..8aec3c79969 100644
--- a/net/link_local.c
+++ b/net/link_local.c
@@ -11,6 +11,7 @@
  * Licensed under the GPL v2 or later
  */
 
+#include <common.h>
 #include <env.h>
 #include <log.h>
 #include <net.h>
diff --git a/net/mdio-mux-uclass.c b/net/mdio-mux-uclass.c
index ee188b504d1..94b90e06576 100644
--- a/net/mdio-mux-uclass.c
+++ b/net/mdio-mux-uclass.c
@@ -4,6 +4,7 @@
  * Alex Marginean, NXP
  */
 
+#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <miiphy.h>
diff --git a/net/mdio-uclass.c b/net/mdio-uclass.c
index 4f052ae432c..0ebfb2f1343 100644
--- a/net/mdio-uclass.c
+++ b/net/mdio-uclass.c
@@ -4,6 +4,7 @@
  * Alex Marginean, NXP
  */
 
+#include <common.h>
 #include <dm.h>
 #include <dm/lists.h>
 #include <eth_phy.h>
diff --git a/net/ndisc.c b/net/ndisc.c
index d417c5987ac..d1cec0601c8 100644
--- a/net/ndisc.c
+++ b/net/ndisc.c
@@ -9,6 +9,7 @@
 
 /* Neighbour Discovery for IPv6 */
 
+#include <common.h>
 #include <net.h>
 #include <net6.h>
 #include <ndisc.h>
diff --git a/net/net.c b/net/net.c
index 23b5d3356af..0fb2d250773 100644
--- a/net/net.c
+++ b/net/net.c
@@ -81,6 +81,7 @@
  */
 
 
+#include <common.h>
 #include <bootstage.h>
 #include <command.h>
 #include <console.h>
diff --git a/net/net6.c b/net/net6.c
index 4cff98df15c..2dd64c0e161 100644
--- a/net/net6.c
+++ b/net/net6.c
@@ -9,12 +9,12 @@
 
 /* Simple IPv6 network layer implementation */
 
+#include <common.h>
 #include <env_internal.h>
 #include <malloc.h>
 #include <net.h>
 #include <net6.h>
 #include <ndisc.h>
-#include <vsprintf.h>
 
 /* NULL IPv6 address */
 struct in6_addr const net_null_addr_ip6 = ZERO_IPV6_ADDR;
diff --git a/net/nfs.c b/net/nfs.c
index acc7106f10d..c18282448cc 100644
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -30,6 +30,7 @@
  * September 27, 2018. As of now, NFSv3 is the default choice. If the server
  * does not support NFSv3, we fall back to versions 2 or 1. */
 
+#include <common.h>
 #include <command.h>
 #include <display_options.h>
 #ifdef CONFIG_SYS_DIRECT_FLASH_NFS
diff --git a/net/pcap.c b/net/pcap.c
index c959e3e4e51..4036d8a3fa5 100644
--- a/net/pcap.c
+++ b/net/pcap.c
@@ -3,10 +3,10 @@
  * Copyright 2019 Ramon Fried <rfried.dev@gmail.com>
  */
 
+#include <common.h>
 #include <net.h>
 #include <net/pcap.h>
 #include <time.h>
-#include <linux/errno.h>
 #include <asm/io.h>
 
 #define LINKTYPE_ETHERNET	1
diff --git a/net/ping6.c b/net/ping6.c
index 2479e08fd82..4882a17f510 100644
--- a/net/ping6.c
+++ b/net/ping6.c
@@ -9,6 +9,7 @@
 
 /* Simple ping6 implementation */
 
+#include <common.h>
 #include <net.h>
 #include <net6.h>
 #include "ndisc.h"
diff --git a/net/rarp.c b/net/rarp.c
index a6b564e314d..231b6233c07 100644
--- a/net/rarp.c
+++ b/net/rarp.c
@@ -4,6 +4,7 @@
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  */
 
+#include <common.h>
 #include <command.h>
 #include <log.h>
 #include <net.h>
diff --git a/net/sntp.c b/net/sntp.c
index 73d1d87d38b..dac0f8ceea1 100644
--- a/net/sntp.c
+++ b/net/sntp.c
@@ -5,6 +5,7 @@
  *
  */
 
+#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <log.h>
diff --git a/net/tcp.c b/net/tcp.c
index b0cc8a1fe3e..a713e1dd609 100644
--- a/net/tcp.c
+++ b/net/tcp.c
@@ -17,6 +17,7 @@
  *                      - TCP application (eg wget)
  *      Next Step       HTTPS?
  */
+#include <common.h>
 #include <command.h>
 #include <console.h>
 #include <env_internal.h>
diff --git a/net/tftp.c b/net/tftp.c
index 6b16bdcbe4c..2e335413492 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -5,6 +5,7 @@
  * Copyright 2011 Comelit Group SpA,
  *                Luca Ceresoli <luca.ceresoli@comelit.it>
  */
+#include <common.h>
 #include <command.h>
 #include <display_options.h>
 #include <efi_loader.h>
diff --git a/net/udp.c b/net/udp.c
index 37162260d17..a93822f511c 100644
--- a/net/udp.c
+++ b/net/udp.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2020 Philippe Reynes <philippe.reynes@softathome.com>
  */
 
+#include <common.h>
 #include <net.h>
 #include <net/udp.h>
 
diff --git a/net/wget.c b/net/wget.c
index f1dd7abeff6..abab371e58e 100644
--- a/net/wget.c
+++ b/net/wget.c
@@ -6,6 +6,7 @@
 
 #include <asm/global_data.h>
 #include <command.h>
+#include <common.h>
 #include <display_options.h>
 #include <env.h>
 #include <image.h>
diff --git a/net/wol.c b/net/wol.c
index 96478ba5751..0a625668a99 100644
--- a/net/wol.c
+++ b/net/wol.c
@@ -3,6 +3,7 @@
  * Copyright 2018 Lothar Felten, lothar.felten@gmail.com
  */
 
+#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <net.h>