Re: [PATCH 3/7] rockchip: mkimage: Print boot0 and boot1 parameters

Hi Alexey,

On 7/13/26 12:02 PM, Alexey Charkov wrote:
> From: Jonas Karlman <[email protected]>
> 
> The v2 image format embeds boot0 and boot1 parameters, the vendor tool
> boot_merger may write these parameters based on the rkboot miniall.ini
> files.
> 
> E.g. a RK3576 boot image may contain a boot1 parameter that signals
> BootROM or vendor blobs to use 1 GHz instead of the regular 24 MHz rate
> for the high precision timer.
> 
> Add support for printing boot0 and boot1 parameters, e.g.:
> 
>    > tools/mkimage -l rk3576_idblock_v1.09.107.img
>    Rockchip Boot Image (v2)
>    Boot1 2: 0x100
>    Image 1: 4096 @ 0x1000
>    - Load address: 0x3ffc0000
>    Image 2: 77824 @ 0x2000
>    - Load address: 0x3ff81000
>    Image 3: 262144 @ 0x15000
> 
> Signed-off-by: Jonas Karlman <[email protected]>
> Signed-off-by: Alexey Charkov <[email protected]>
> ---
>   tools/rkcommon.c | 18 +++++++++++++++++-
>   1 file changed, 17 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/rkcommon.c b/tools/rkcommon.c
> index fe0afc5629b3..992c90791ffc 100644
> --- a/tools/rkcommon.c
> +++ b/tools/rkcommon.c
> @@ -62,6 +62,8 @@ struct image_entry {
>    * @boot_flag:	[3:0] hash type (0:none, 1:sha256, 2:sha512)
>    * @images:	images
>    * @hash:	hash or signature for header info
> + *
> + * Other fields are not used by U-Boot
>    */
>   struct header0_info_v2 {
>   	uint32_t magic;
> @@ -69,7 +71,9 @@ struct header0_info_v2 {
>   	uint16_t size;
>   	uint16_t num_images;
>   	uint32_t boot_flag;
> -	uint8_t reserved1[104];
> +	uint8_t reserved1[32];
> +	uint32_t boot0_param[10];
> +	uint32_t boot1_param[8];

Shouldn't we use the plural form here (param*s*)? I guess this is to 
match BOOT0_PARAM or BOOT1_PARAM in rkbin/RKBOOT? Can you maybe add a 
comment for these structure members?

I see there are files in rkbin/RKBOOT/ with up to 10 WORD_* variables 
for BOOT0_PARAM and up to 8 for BOOT1_PARAM so this looks fine to me. 
I've checked the offset by running boot_merger with a specific value as 
WORD_0 for both. WORD_X with X > 8 for BOOT1_PARAM. seem to be ignored, 
same for X > 10 for BOOT0_PARAM

>   	struct image_entry images[4];
>   	uint8_t reserved2[1064];
>   	uint8_t hash[512];
> @@ -510,6 +514,18 @@ static void rkcommon_print_header_v2(const struct header0_info_v2 *hdr)
>   
>   	printf("Rockchip Boot Image (v2)\n");
>   
> +	for (i = 0; i < ARRAY_SIZE(hdr->boot0_param); i++) {
> +		val = le32_to_cpu(hdr->boot0_param[i]);
> +		if (val)
> +			printf("Boot0 %d: 0x%x\n", i, val);
> +	}
> +
> +	for (i = 0; i < ARRAY_SIZE(hdr->boot1_param); i++) {
> +		val = le32_to_cpu(hdr->boot1_param[i]);
> +		if (val)
> +			printf("Boot1 %d: 0x%x\n", i, val);
> +	}
> +

Should we use %04x here to print leading zeroes so they nicely align in 
the output if there are multiple boot parameters?

Reviewed-by: Quentin Schulz <[email protected]>

Thanks!
Quentin