arm64: zynqmp: Use DTB address base from .config

CONFIG_XILINX_OF_BOARD_DTB_ADDR holds DTB address which U-Boot is checking.
Currently address in binman match default value but macro can be used
directly.
Also sync node name (s/hash-1/hash/) and sync location to have the same
order load/hash/image.

All binman DTSes are compiled that's why also guard
CONFIG_XILINX_OF_BOARD_DTB_ADDR which depends on OF_BOARD || OF_SEPARATE
which is a problem for mini configurations which are using OF_EMBED.

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

diff --git a/arch/arm/dts/zynqmp-binman-som.dts b/arch/arm/dts/zynqmp-binman-som.dts
index a697c2c..a66b948 100644 (file)
--- a/arch/arm/dts/zynqmp-binman-som.dts
+++ b/arch/arm/dts/zynqmp-binman-som.dts
@@ -162,7 +162,9 @@
                                                type = "flat_dt";
                                                arch = "arm64";
                                                compression = "none";
-                                               load = <0x0 0x100000>;
+#if CONFIG_XILINX_OF_BOARD_DTB_ADDR
+                                               load = /bits/ 64 <CONFIG_XILINX_OF_BOARD_DTB_ADDR>;
+#endif
                                                hash {
                                                        algo = "md5";
                                                };

diff --git a/arch/arm/dts/zynqmp-binman.dts b/arch/arm/dts/zynqmp-binman.dts
index 4583871..16e1052 100644 (file)
--- a/arch/arm/dts/zynqmp-binman.dts
+++ b/arch/arm/dts/zynqmp-binman.dts
@@ -75,8 +75,10 @@
                                                type = "flat_dt";
                                                arch = "arm64";
                                                compression = "none";
-                                               load = <0x0 0x100000>;
-                                               hash-1 {
+#if CONFIG_XILINX_OF_BOARD_DTB_ADDR
+                                               load = /bits/ 64 <CONFIG_XILINX_OF_BOARD_DTB_ADDR>;
+#endif
+                                               hash {
                                                        algo = "md5";
                                                };
                                        };
@@ -152,15 +154,16 @@
                                                type = "flat_dt";
                                                arch = "arm64";
                                                compression = "none";
-                                               load = <0x0 0x100000>;
+#if CONFIG_XILINX_OF_BOARD_DTB_ADDR
+                                               load = /bits/ 64 <CONFIG_XILINX_OF_BOARD_DTB_ADDR>;
+#endif
+                                               hash {
+                                                       algo = "md5";
+                                               };
                                                uboot-fdt-blob {
                                                        filename = "u-boot.dtb";
                                                        type = "blob-ext";
                                                };
-                                               hash-1 {
-                                                       algo = "md5";
-                                               };
-
                                        };
                                };
                                configurations {