arm64: zynqmp: enable u-boot itb generation via binman if SPL is enabled

Output images are generated via Binman only if SPL is enabled, as
there is no consumer for them otherwise. An #ifdef check ensures that
when SPL is enabled, Binman generates the U-Boot ITB. If SPL is disabled,
ITB generation is skipped since the ITB format is supported only by SPL.
Without SPL, generating such an image is unnecessary, as it would not be
used

The second reason is that when a DTB is passed, the current logic cannot
handle it without an additional step in U-Boot to parse an appended FIT
image and enable board-specific code to select the correct DTB config.
The MULTI_DTB_FIT configuration should be used if support for multiple
DTBs is required, but SPL is not being used.

Signed-off-by: Prasad Kummari <prasad.kummari@amd.com>
Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/7cba738ae36dacf7d1b0cfbaf13e0c9b3a0df225.1737462296.git.michal.simek@amd.com

diff --git a/arch/arm/dts/zynqmp-binman-som.dts b/arch/arm/dts/zynqmp-binman-som.dts
index 3d9d8476c98ebf4f4f7c41d3ec0b2942c0a7f11b..3ffa06f0c04fccc1edc9f2a60d2e3b65c19d0df1 100644 (file)
--- a/arch/arm/dts/zynqmp-binman-som.dts
+++ b/arch/arm/dts/zynqmp-binman-som.dts
@@ -13,6 +13,8 @@
 / {
        binman: binman {
                multiple-images;
+
+#ifdef CONFIG_SPL
                fit-dtb.blob {
                        filename = "fit-dtb.blob";
                        pad-byte = <0>;
@@ -220,6 +222,7 @@
                        fdtmap {
                        };
                };
+#endif
 #endif
        };
 };

diff --git a/arch/arm/dts/zynqmp-binman.dts b/arch/arm/dts/zynqmp-binman.dts
index 675f6bf51ebddf6a478d60470cb8cd127e6a7e87..bf3335a3e539257840d6e33d32516aa5b40facce 100644 (file)
--- a/arch/arm/dts/zynqmp-binman.dts
+++ b/arch/arm/dts/zynqmp-binman.dts
@@ -14,6 +14,7 @@
        binman: binman {
                multiple-images;
 
+#ifdef CONFIG_SPL
                /* u-boot.itb generation in a static way */
                itb {
                        filename = "u-boot.itb";
@@ -201,6 +202,7 @@
                        fdtmap {
                        };
                };
+#endif
 #endif
        };
 };