[PATCH v4 3/7] rockchip: Include binman script in 64-bit boards

[Quentin Schulz]

Hi Simon,

On 11/6/22 23:40, Simon Glass wrote:
> Include the rockchip-u-boot.dtsi file with 64-bit boards and enable binman
> so that these boards can also use it, rather than using special Makefile
> rules and scripts.
> 
> This does not change the Makefile nor remove any scripts, but sets it up
> so that this is possible.
> 
> Signed-off-by: Simon Glass <sjg at chromium.org>
> Reviewed-by: Alper Nebi Yasak <alpernebiyasak at gmail.com>
> ---
> 
> (no changes since v1)
> 
>   arch/arm/dts/rk3368-u-boot.dtsi             | 1 +
>   arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi | 2 +-
>   arch/arm/dts/rk3399-u-boot.dtsi             | 3 +++
>   arch/arm/mach-rockchip/Kconfig              | 6 ++++++
>   4 files changed, 11 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/dts/rk3368-u-boot.dtsi b/arch/arm/dts/rk3368-u-boot.dtsi
> index 811d59ac346..4c0a6ff1561 100644
> --- a/arch/arm/dts/rk3368-u-boot.dtsi
> +++ b/arch/arm/dts/rk3368-u-boot.dtsi
> @@ -3,6 +3,7 @@
>    * Copyright (c) 2020 Theobroma Systems Design und Consulting GmbH
>    */
>   
> +#include "rockchip-u-boot.dtsi"
>   #include <dt-bindings/memory/rk3368-dmc.h>
>   #include "rockchip-u-boot.dtsi"
>   

Already included here^

> diff --git a/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi b/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi
> index f8335c74a74..1af3bbfb3d3 100644
> --- a/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi
> @@ -46,7 +46,7 @@
>   
>   &binman {
>   	simple-bin {
> -		blob {
> +		fit {

NACK. It is still blob and not fit until a later patch :)

>   			offset = <((CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR - 64) * 512)>;
>   		};
>   	};
> diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi
> index 3c1a15fe51b..63da02489d3 100644
> --- a/arch/arm/dts/rk3399-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-u-boot.dtsi
> @@ -62,6 +62,8 @@
>   
>   #if defined(CONFIG_ROCKCHIP_SPI_IMAGE) && defined(CONFIG_HAS_ROM)
>   &binman {
> +	multiple-images;
> +#ifdef CONFIG_ROCKCHIP_SPI_IMAGE

that's redundant, it's already checked three lines above.

>   	rom {
>   		filename = "u-boot.rom";
>   		size = <0x400000>;
> @@ -81,6 +83,7 @@
>   		fdtmap {
>   		};
>   	};
> +#endif /* CONFIG_ROCKCHIP_SPI_IMAGE */
>   };
>   #endif
>   
> diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
> index 69d51ff3789..90d42650211 100644
> --- a/arch/arm/mach-rockchip/Kconfig
> +++ b/arch/arm/mach-rockchip/Kconfig
> @@ -15,6 +15,7 @@ config ROCKCHIP_PX30
>   	select DEBUG_UART_BOARD_INIT
>   	imply ROCKCHIP_COMMON_BOARD
>   	imply SPL_ROCKCHIP_COMMON_BOARD
> +	imply BINMAN

arch/arm/Kconfig has ARCH_ROCKCHIP select BINMAN if SPL_OPTEE || SPL, is 
this not enough?

Cheers,
Quentin