[PATCH u-boot-marvell 11/11] tools: kwbimage: Properly set srcaddr in kwbimage v0

[Stefan Roese]

On 08.11.21 18:12, Marek Behún wrote:
> From: Pali Rohár <pali at kernel.org>
> 
> Field srcaddr in kwbimage v0 needs to be adjusted similarly like in v1.
> 
> Signed-off-by: Pali Rohár <pali at kernel.org>
> Signed-off-by: Marek Behún <marek.behun at nic.cz>

Reviewed-by: Stefan Roese <sr at denx.de>

Thanks,
Stefan

> ---
>   tools/kwbimage.c | 22 ++++++++++++++++++++++
>   1 file changed, 22 insertions(+)
> 
> diff --git a/tools/kwbimage.c b/tools/kwbimage.c
> index 952023c14c..875f636c7a 100644
> --- a/tools/kwbimage.c
> +++ b/tools/kwbimage.c
> @@ -937,6 +937,28 @@ static void *image_create_v0(size_t *imagesz, struct image_tool_params *params,
>   	main_hdr->checksum = image_checksum8(image,
>   					     sizeof(struct main_hdr_v0));
>   
> +	/*
> +	 * For SATA srcaddr is specified in number of sectors starting from
> +	 * sector 0. The main header is stored at sector number 1.
> +	 * This expects the sector size to be 512 bytes.
> +	 * Header size is already aligned.
> +	 */
> +	if (main_hdr->blockid == IBR_HDR_SATA_ID)
> +		main_hdr->srcaddr = cpu_to_le32(headersz / 512 + 1);
> +
> +	/*
> +	 * For SDIO srcaddr is specified in number of sectors starting from
> +	 * sector 0. The main header is stored at sector number 0.
> +	 * This expects sector size to be 512 bytes.
> +	 * Header size is already aligned.
> +	 */
> +	if (main_hdr->blockid == IBR_HDR_SDIO_ID)
> +		main_hdr->srcaddr = cpu_to_le32(headersz / 512);
> +
> +	/* For PCIe srcaddr is not used and must be set to 0xFFFFFFFF. */
> +	if (main_hdr->blockid == IBR_HDR_PEX_ID)
> +		main_hdr->srcaddr = cpu_to_le32(0xFFFFFFFF);
> +
>   	/* Generate the ext header */
>   	if (has_ext) {
>   		struct ext_hdr_v0 *ext_hdr;
> 

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de