[PATCH 3/3] rockchip: Fix binman error

[FUKAUMI Naoki]

Hi Quentin,

On 2/5/25 21:59, Quentin Schulz wrote:
> Hi Naoki,
> 
> On 1/29/25 2:25 PM, FUKAUMI Naoki wrote:
>> After adding the below configs, binman produces an error.
>>
>>   CONFIG_SPL_DFU
>>   CONFIG_SPL_ENV_SUPPORT
>>   CONFIG_SPL_USB_DWC3_GENERIC
>>   CONFIG_SPL_USB_GADGET
>>
>> binman: Section '/binman/simple-bin-spi': Symbol 
>> '_binman_u_boot_any_prop_size'
>>     in entry '/binman/simple-bin-spi/mkimage/u-boot-spl/u-boot-spl- 
>> nodtb': Entry 'u-boot-any' not found in list (u-boot-tpl-nodtb,u-boot- 
>> tpl-dtb,u-boot-tpl,u-boot-spl-nodtb,u-boot-spl-dtb,u-boot- 
>> spl,mkimage,fit,simple-bin-spi)
>>
>> Add "no-write-symbols;" to u-boot-tpl and u-boot-spl.
>>
> 
> I'll be frank with you, I have no clue what's happening :)
> 
> But, it seems this only applies to the SPI image (disable 
> ROCKCHIP_SPI_IMAGE and it'll built just fine). Why? No clue.
> 
> I've never liked how the simple-bin-spi was built because we should be 
> reusing artifacts from simple-bin instead of rebuilding stuff. That's 
> why you have /binman/simple-bin-spi/mkimage/fit being a blob, because we 
> want to reuse the fitImage from /binman/simple-bin/mkimage/fit but we 
> didn't do this for the other ones.
> 
> Can you try to revert your patch here and use this instead:
> 
> """
> diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u- 
> boot.dtsi
> index 70f35b6c197..0a5771b706f 100644
> --- a/arch/arm/dts/rk3399-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-u-boot.dtsi
> @@ -45,9 +45,15 @@
>               };
>   #elif defined(CONFIG_TPL)
>               u-boot-tpl {
> +                /* sync with /binman/simple-bin/mkimage/u-boot-tpl */
> +                type = "blob";
> +                filename = "tpl/u-boot-tpl.bin";
>               };
>   #endif
>               u-boot-spl {
> +                /* sync with /binman/simple-bin/mkimage/u-boot-spl */
> +                type = "blob";
> +                filename = "spl/u-boot-spl.bin";
>               };
>           };
>           fit {
> diff --git a/arch/arm/dts/rockchip-u-boot.dtsi b/arch/arm/dts/rockchip- 
> u-boot.dtsi
> index c8c928c7e50..fea49eb3145 100644
> --- a/arch/arm/dts/rockchip-u-boot.dtsi
> +++ b/arch/arm/dts/rockchip-u-boot.dtsi
> @@ -187,9 +187,15 @@
>               };
>   #elif defined(CONFIG_TPL)
>               u-boot-tpl {
> +                /* sync with /binman/simple-bin/mkimage/u-boot-tpl */
> +                type = "blob";
> +                filename = "tpl/u-boot-tpl.bin";
>               };
>   #endif
>               u-boot-spl {
> +                /* sync with /binman/simple-bin/mkimage/u-boot-spl */
> +                type = "blob";
> +                filename = "spl/u-boot-spl.bin";
>               };
>           };
> """
> 
> This seems to work for me on RK3399 Puma and Rock-Pi-4 builds with the 
> symbols you listed enabled. I also believe this should be "better" than 
> what we have today.
> 
> If that works, I'll send a proper patch for this :)

Proper patch please :)

Best regards,

--
FUKAUMI Naoki
Radxa Computer (Shenzhen) Co., Ltd.

> Cheers,
> Quentin
>