Re: [PATCH v2] arm64: zynqmp: Use CONFIG_SPL_FS_LOAD_PAYLOAD_NAME in binman

[Michal Simek]

On 4/7/25 17:17, Michal Simek wrote:

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>
---

Changes in v2:
- Also support image generation when FS support is disabled based
   on discussion with Quentin Schulz <quentin.sch...@cherry.de>

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

diff --git a/arch/arm/dts/zynqmp-binman-som.dts 
b/arch/arm/dts/zynqmp-binman-som.dts
index d5b63ef604ba..a70123feeadd 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.si...@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 {
                        };
diff --git a/arch/arm/dts/zynqmp-binman.dts b/arch/arm/dts/zynqmp-binman.dts
index 252c2ad552b0..59c1388fb1d0 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.si...@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 {
                        };

Applied.
M