[U-Boot] [PATCH] tools: kwboot: don't adjust destaddr when patching the image

[Stefan Roese]

On 15.02.2017 03:34, Chris Packham wrote:
> Commit 94084eea3bd3 ("tools: kwbimage: Fix dest addr") changed kwbimage
> to do this adjustment. So now the adjustment in kwboot is not needed
> (and would prevent UART booting for images generated by the new
> kwbimage). Remove the destaddr adjustment in kwboot.
>
> Signed-off-by: Chris Packham <judge.packham at gmail.com>
> ---
>
>  tools/kwboot.c | 8 --------
>  1 file changed, 8 deletions(-)
>
> diff --git a/tools/kwboot.c b/tools/kwboot.c
> index 26b394963cd8..8a421cda4ea5 100644
> --- a/tools/kwboot.c
> +++ b/tools/kwboot.c
> @@ -664,14 +664,6 @@ kwboot_img_patch_hdr(void *img, size_t size)
>  		hdr_v0->srcaddr = hdr_v0->ext
>  			? sizeof(struct kwb_header)
>  			: sizeof(*hdr_v0);
> -	} else {
> -		/*
> -		 * Subtract mkimage header size from destination address
> -		 * as this header is not expected by the Marvell BootROM.
> -		 * This way, the execution address is identical to the
> -		 * one the image is compiled for (TEXT_BASE).
> -		 */
> -		hdr->destaddr = hdr->destaddr - sizeof(struct image_header);
>  	}
>
>  	hdr->checksum = kwboot_img_csum8(hdr, hdrsz) - csum;
>

Applied to u-boot-marvell/master

Thanks,
Stefan