Merge tag 'v2024.07-rc3' into next

Prepare v2024.07-rc3

18 files changed, 20 insertions, 7 deletions

diff --git a/env/Kconfig b/env/Kconfig
index 9641abe371a..1f8e90af55e 100644
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -312,7 +312,7 @@ config ENV_IS_IN_NVRAM
 
 config ENV_IS_IN_ONENAND
 	bool "Environment is in OneNAND"
-	depends on !CHAIN_OF_TRUST && CMD_ONENAND
+	depends on !CHAIN_OF_TRUST
 	help
 	  Define this if you want to put your local device's environment in
 	  OneNAND.
diff --git a/env/attr.c b/env/attr.c
index fed5b212e2f..a958c714828 100644
--- a/env/attr.c
+++ b/env/attr.c
@@ -4,13 +4,13 @@
  * Joe Hershberger, National Instruments, [email protected]
  */
 
-#include <stdio.h>
 #ifdef USE_HOSTCC /* Eliminate "ANSI does not permit..." warnings */
 #include <stdint.h>
+#include <stdio.h>
 #include <linux/linux_string.h>
 #else
+#include <common.h>
 #include <slre.h>
-#include <vsprintf.h>
 #endif
 
 #include <env_attr.h>
diff --git a/env/callback.c b/env/callback.c
index b7cbccd1175..98ddba035ea 100644
--- a/env/callback.c
+++ b/env/callback.c
@@ -4,6 +4,7 @@
  * Joe Hershberger, National Instruments, [email protected]
  */
 
+#include <common.h>
 #include <env.h>
 #include <env_internal.h>
 #include <asm/global_data.h>
diff --git a/env/common.c b/env/common.c
index d8c276dddfd..48a565107c1 100644
--- a/env/common.c
+++ b/env/common.c
@@ -7,6 +7,7 @@
  * Andreas Heppel <[email protected]>
  */
 
+#include <common.h>
 #include <bootstage.h>
 #include <command.h>
 #include <env.h>
diff --git a/env/eeprom.c b/env/eeprom.c
index b290b1013e1..7ce7e9972b2 100644
--- a/env/eeprom.c
+++ b/env/eeprom.c
@@ -7,6 +7,7 @@
  * Andreas Heppel <[email protected]>
  */
 
+#include <common.h>
 #include <command.h>
 #include <eeprom.h>
 #include <env.h>
diff --git a/env/env.c b/env/env.c
index bcc189e14db..bae3f6482ae 100644
--- a/env/env.c
+++ b/env/env.c
@@ -4,13 +4,13 @@
  * Written by Simon Glass <[email protected]>
  */
 
+#include <common.h>
 #include <env.h>
 #include <env_internal.h>
 #include <log.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
-#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/env/ext4.c b/env/ext4.c
index d92c844ea6c..f21939186f0 100644
--- a/env/ext4.c
+++ b/env/ext4.c
@@ -18,6 +18,7 @@
  * Manjunatha C Achar <[email protected]>
  */
 
+#include <common.h>
 #include <part.h>
 
 #include <command.h>
diff --git a/env/fat.c b/env/fat.c
index f3f8b7301ee..d87a47b1001 100644
--- a/env/fat.c
+++ b/env/fat.c
@@ -6,6 +6,7 @@
  *  Maximilian Schwerin <[email protected]>
  */
 
+#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>
diff --git a/env/flags.c b/env/flags.c
index 233fd460d84..e2866361dfe 100644
--- a/env/flags.c
+++ b/env/flags.c
@@ -8,9 +8,9 @@
 #include <linux/string.h>
 #include <linux/ctype.h>
 
-#include <stdio.h>
 #ifdef USE_HOSTCC /* Eliminate "ANSI does not permit..." warnings */
 #include <stdint.h>
+#include <stdio.h>
 #include "fw_env_private.h"
 #include "fw_env.h"
 #include <env_attr.h>
@@ -18,7 +18,7 @@
 #define env_get fw_getenv
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 #else
-#include <linux/kernel.h>
+#include <common.h>
 #include <env_internal.h>
 #endif
 
diff --git a/env/flash.c b/env/flash.c
index 1bd6e7003d6..1e75f8c004e 100644
--- a/env/flash.c
+++ b/env/flash.c
@@ -9,6 +9,7 @@
 
 /* #define DEBUG */
 
+#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>
diff --git a/env/mmc.c b/env/mmc.c
index 776df0786be..7afb733e890 100644
--- a/env/mmc.c
+++ b/env/mmc.c
@@ -5,6 +5,7 @@
 
 /* #define DEBUG */
 
+#include <common.h>
 #include <asm/global_data.h>
 
 #include <command.h>
diff --git a/env/nand.c b/env/nand.c
index fef5697ec39..df300b13179 100644
--- a/env/nand.c
+++ b/env/nand.c
@@ -13,6 +13,7 @@
  * Andreas Heppel <[email protected]>
  */
 
+#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>
diff --git a/env/nowhere.c b/env/nowhere.c
index 326f27db2e9..9ebc357dbd7 100644
--- a/env/nowhere.c
+++ b/env/nowhere.c
@@ -7,6 +7,7 @@
  * Andreas Heppel <[email protected]>
  */
 
+#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>
diff --git a/env/nvram.c b/env/nvram.c
index d49cd0f337a..229c34f5367 100644
--- a/env/nvram.c
+++ b/env/nvram.c
@@ -7,6 +7,7 @@
  * Andreas Heppel <[email protected]>
  */
 
+#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>
diff --git a/env/onenand.c b/env/onenand.c
index 8c349ef5ce6..1faa2cb62a3 100644
--- a/env/onenand.c
+++ b/env/onenand.c
@@ -7,6 +7,7 @@
  * Kyungmin Park <[email protected]>
  */
 
+#include <common.h>
 #include <command.h>
 #include <env_internal.h>
 #include <asm/global_data.h>
diff --git a/env/remote.c b/env/remote.c
index 0cc383c2360..166bebf52b5 100644
--- a/env/remote.c
+++ b/env/remote.c
@@ -5,10 +5,10 @@
 
 /* #define DEBUG */
 
+#include <common.h>
 #include <command.h>
 #include <env_internal.h>
 #include <asm/global_data.h>
-#include <linux/errno.h>
 #include <linux/stddef.h>
 #include <u-boot/crc.h>
 
diff --git a/env/sf.c b/env/sf.c
index c747e175e31..8f5c03b00d3 100644
--- a/env/sf.c
+++ b/env/sf.c
@@ -8,6 +8,7 @@
  *
  * (C) Copyright 2008 Atmel Corporation
  */
+#include <common.h>
 #include <dm.h>
 #include <env.h>
 #include <env_internal.h>
diff --git a/env/ubi.c b/env/ubi.c
index 0c3e93c2bf2..445d34fedb8 100644
--- a/env/ubi.c
+++ b/env/ubi.c
@@ -4,6 +4,7 @@
  *        Joe Hershberger <[email protected]>
  */
 
+#include <common.h>
 #include <asm/global_data.h>
 
 #include <command.h>