[PATCH] arm64: zynqmp: Use CONFIG_SPL_FS_LOAD_PAYLOAD_NAME in binman

[Michal Simek]

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.si...@amd.com>
---

 arch/arm/dts/zynqmp-binman-som.dts | 11 ++++++-----
 arch/arm/dts/zynqmp-binman.dts     |  8 ++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/arch/arm/dts/zynqmp-binman-som.dts 
b/arch/arm/dts/zynqmp-binman-som.dts
index d5b63ef604ba..26a5a634a9c8 100644
--- a/arch/arm/dts/zynqmp-binman-som.dts
+++ b/arch/arm/dts/zynqmp-binman-som.dts
@@ -14,7 +14,7 @@
        binman: binman {
                multiple-images;
 
-#ifdef CONFIG_SPL
+#if defined(CONFIG_SPL)
                fit-dtb.blob {
                        filename = "fit-dtb.blob";
                        pad-byte = <0>;
@@ -102,10 +102,10 @@
                                };
                        };
                };
-
-               /* u-boot.itb generation in a static way */
+#if defined(CONFIG_SPL_FS_LOAD_PAYLOAD_NAME)
+               /* Generation in a static way */
                itb {
-                       filename = "u-boot.itb";
+                       filename = CONFIG_SPL_FS_LOAD_PAYLOAD_NAME;
                        pad-byte = <0>;
 
                        fit {
@@ -227,12 +227,13 @@
                        };
                        blob-ext@2 {
                                offset = <CONFIG_SYS_SPI_U_BOOT_OFFS>;
-                               filename = "u-boot.itb";
+                               filename = CONFIG_SPL_FS_LOAD_PAYLOAD_NAME;
                        };
                        fdtmap {
                        };
                };
 #endif
+#endif
 #endif
        };
 };
diff --git a/arch/arm/dts/zynqmp-binman.dts b/arch/arm/dts/zynqmp-binman.dts
index 252c2ad552b0..d2ccd9d32ec6 100644
--- a/arch/arm/dts/zynqmp-binman.dts
+++ b/arch/arm/dts/zynqmp-binman.dts
@@ -14,10 +14,10 @@
        binman: binman {
                multiple-images;
 
-#ifdef CONFIG_SPL
-               /* u-boot.itb generation in a static way */
+#if defined(CONFIG_SPL) && defined(CONFIG_SPL_FS_LOAD_PAYLOAD_NAME)
+               /* Generation in a static way */
                itb {
-                       filename = "u-boot.itb";
+                       filename = CONFIG_SPL_FS_LOAD_PAYLOAD_NAME;
                        pad-byte = <0>;
 
                        fit {
@@ -196,7 +196,7 @@
                        };
                        blob-ext@2 {
                                offset = <CONFIG_SYS_SPI_U_BOOT_OFFS>;
-                               filename = "u-boot.itb";
+                               filename = CONFIG_SPL_FS_LOAD_PAYLOAD_NAME;
                        };
                        fdtmap {
                        };
-- 
2.43.0