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 <[email protected]> --- Changes in v2: - Guard CONFIG_XILINX_OF_BOARD_DTB_ADDR usage in binman arch/arm/dts/zynqmp-binman-som.dts | 4 +++- arch/arm/dts/zynqmp-binman.dts | 17 ++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/arch/arm/dts/zynqmp-binman-som.dts b/arch/arm/dts/zynqmp-binman-som.dts index a697c2c1945c..a66b948b266c 100644 --- 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 458387161c35..16e1052a64a9 100644 --- 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 { -- 2.43.0
