commit a734f2531afd2dc9d054d7fbc1bc02a7f217f996
author Michal Simek <michal.simek@amd.com> Mon Apr 07 17:17:30 2025 +0200
committer Michal Simek <michal.simek@amd.com> Wed Apr 16 13:44:44 2025 +0200
tree c58608c35235d551cb09a27441213cae071759e9
parent fd6561bd49ae313a8e2002940d9d635cc27b4bf4

arm64: zynqmp: Use CONFIG_SPL_FS_LOAD_PAYLOAD_NAME in binman

u-boot.itb name is coming via CONFIG_SPL_FS_LOAD_PAYLOAD_NAME and it's
change will affect SD boot mode that's why start to use it.

Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/0f037e62e2d8486c0f68f204b45705be9e996ba7.1744039048.git.michal.simek@amd.com

arch/arm/dts/zynqmp-binman-som.dts

diff --git a/arch/arm/dts/zynqmp-binman-som.dts b/arch/arm/dts/zynqmp-binman-som.dts
index d5b63ef..a70123f 100644
--- a/arch/arm/dts/zynqmp-binman-som.dts
+++ b/arch/arm/dts/zynqmp-binman-som.dts
@@ -2,13 +2,19 @@
 /*
  * dts file for Xilinx ZynqMP SOMs (k24/k26)
  *
- * (C) Copyright 2024, Advanced Micro Devices, Inc.
+ * (C) Copyright 2024-2025, Advanced Micro Devices, Inc.
  *
  * Michal Simek <michal.simek@amd.com>
  */
 
 #include <config.h>
 
+#if defined(CONFIG_SPL_FS_LOAD_PAYLOAD_NAME)
+#define U_BOOT_ITB_FILENAME	CONFIG_SPL_FS_LOAD_PAYLOAD_NAME
+#else
+#define U_BOOT_ITB_FILENAME	"u-boot.itb"
+#endif
+
 /dts-v1/;
 / {
 	binman: binman {
@@ -103,9 +109,9 @@
 			};
 		};
 
-		/* u-boot.itb generation in a static way */
+		/* Generation in a static way */
 		itb {
-			filename = "u-boot.itb";
+			filename = U_BOOT_ITB_FILENAME;
 			pad-byte = <0>;
 
 			fit {
@@ -227,7 +233,7 @@
 			};
 			blob-ext@2 {
 				offset = <CONFIG_SYS_SPI_U_BOOT_OFFS>;
-				filename = "u-boot.itb";
+				filename = U_BOOT_ITB_FILENAME;
 			};
 			fdtmap {
 			};

arch/arm/dts/zynqmp-binman.dts

diff --git a/arch/arm/dts/zynqmp-binman.dts b/arch/arm/dts/zynqmp-binman.dts
index 252c2ad..59c1388 100644
--- a/arch/arm/dts/zynqmp-binman.dts
+++ b/arch/arm/dts/zynqmp-binman.dts
@@ -2,22 +2,28 @@
 /*
  * dts file for Xilinx ZynqMP platforms
  *
- * (C) Copyright 2024, Advanced Micro Devices, Inc.
+ * (C) Copyright 2024-2025, Advanced Micro Devices, Inc.
  *
  * Michal Simek <michal.simek@amd.com>
  */
 
 #include <config.h>
 
+#if defined(CONFIG_SPL_FS_LOAD_PAYLOAD_NAME)
+#define U_BOOT_ITB_FILENAME	CONFIG_SPL_FS_LOAD_PAYLOAD_NAME
+#else
+#define U_BOOT_ITB_FILENAME	"u-boot.itb"
+#endif
+
 /dts-v1/;
 / {
 	binman: binman {
 		multiple-images;
 
 #ifdef CONFIG_SPL
-		/* u-boot.itb generation in a static way */
+		/* Generation in a static way */
 		itb {
-			filename = "u-boot.itb";
+			filename = U_BOOT_ITB_FILENAME;
 			pad-byte = <0>;
 
 			fit {
@@ -196,7 +202,7 @@
 			};
 			blob-ext@2 {
 				offset = <CONFIG_SYS_SPI_U_BOOT_OFFS>;
-				filename = "u-boot.itb";
+				filename = U_BOOT_ITB_FILENAME;
 			};
 			fdtmap {
 			};