Merge tag 'u-boot-stm32-20250930' of https://source.denx.de/u-boot/custodians/u-boot-stm

CI: https://source.denx.de/u-boot/custodians/u-boot-stm/-/pipelines/27776

- stm32mp1: Fix env_get_location()
- stm32mp2: Update register used by BL31 for boot parameter

arch/arm/mach-stm32mp/stm32mp2/cpu.c

diff --git a/arch/arm/mach-stm32mp/stm32mp2/cpu.c b/arch/arm/mach-stm32mp/stm32mp2/cpu.c
index c3b87d7..e081dc6 100644
--- a/arch/arm/mach-stm32mp/stm32mp2/cpu.c
+++ b/arch/arm/mach-stm32mp/stm32mp2/cpu.c
@@ -92,13 +92,21 @@
 }
 
 /*
- * Save the FDT address provided by TF-A in r2 at boot time
+ * Save the FDT address provided by TF-A at boot time
  * This function is called from start.S
  */
-void save_boot_params(unsigned long r0, unsigned long r1, unsigned long r2,
-		      unsigned long r3)
+void save_boot_params(unsigned long x0, unsigned long x1, unsigned long x2,
+		      unsigned long x3)
 {
-	nt_fw_dtb = r2;
+	/* use the ARM64 kernel booting register settings:
+	 * x0 = physical address of device tree blob (dtb) in system RAM.
+	 * so kernel can replace U-Boot in FIP wihtout BL31 modification
+	 * else falback to x2 used in previous TF-A version
+	 */
+	if (x0)
+		nt_fw_dtb = x0;
+	else
+		nt_fw_dtb = x2;
 
 	save_boot_params_ret();
 }

board/st/stm32mp1/stm32mp1.c

diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index ab7af69..cb5cab9 100644
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -751,6 +751,8 @@
 	case BOOT_FLASH_EMMC:
 		if (CONFIG_IS_ENABLED(ENV_IS_IN_MMC))
 			return ENVL_MMC;
+		else if (CONFIG_IS_ENABLED(ENV_IS_IN_EXT4))
+			return ENVL_EXT4;
 		else
 			return ENVL_NOWHERE;