[PATCH v2 14/35] rockchip: dts: Use the new binman template for the SPI image too

[Jonas Karlman]

Hi Simon,

On 2025-02-09 22:14, Simon Glass wrote:
> At present simple-bin-spi relies on the u-boot.itb file created by the
> simple-bin image. Use the template to avoid this, since Binman may
> change to process images in parallel in the future.
> 
> Drop the filename to prevent another image being created which uses the
> u-boot.itb file.

As mentioned in "rockchip: dts: Create a template for the FIT",
we should keep the u-boot.itb file a few more releases.

> 
> Signed-off-by: Simon Glass <sjg at chromium.org>
> Suggested-by: Jonas Karlman <jonas at kwiboo.se>
> ---
> 
> (no changes since v1)
> 
>  arch/arm/dts/rockchip-u-boot.dtsi | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/arch/arm/dts/rockchip-u-boot.dtsi b/arch/arm/dts/rockchip-u-boot.dtsi
> index 281119a53d3..79f4188b76b 100644
> --- a/arch/arm/dts/rockchip-u-boot.dtsi
> +++ b/arch/arm/dts/rockchip-u-boot.dtsi
> @@ -41,7 +41,6 @@
>  #endif
>  		#address-cells = <1>;
>  		fit,fdt-list = "of-list";
> -		filename = "u-boot.itb";
>  		fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
>  		fit,align = <512>;
>  		images {
> @@ -208,8 +207,7 @@
>  
>  #if defined(CONFIG_ARM64) || defined(CONFIG_SPL_OPTEE_IMAGE)

As mentioned in "rockchip: dts: Create a template for the FIT", this
should be changed to "#ifdef HAS_FIT".

>  		fit {
> -			type = "blob";
> -			filename = "u-boot.itb";
> +			insert-template = <&common_part>;
>  #else
>  		u-boot-img {
>  #endif

Please also update u-boot.rom in rk3399-u-boot.dtsi to use this template.

With that included this is,

Reviewed-by: Jonas Karlman <jonas at kwiboo.se>


I also strongly recommend you break out following rockchip-u-boot.dtsi
related patches into its own separate series:
- rockchip: dts: Correct the OS for U-Boot
- rockchip: dts: Factor out arch and compression
- rockchip: dts: Add an fdtmap
- rockchip: dts: Create a template for the FIT
- rockchip: dts: Un-indent the FIT template
- rockchip: dts: Use the new binman template for the SPI image too

Those patches stand on their own and help solve the "Entry 'u-boot-any'
not found in list"-issue in "rockchip: Fix binman error" [1].

[1] https://patchwork.ozlabs.org/patch/2040246/

Regards,
Jonas