Browse Source

tools: kwboot: don't adjust destaddr when patching the image

Commit 94084eea3b ("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@gmail.com>
Signed-off-by: Stefan Roese <sr@denx.de>
tags/2020-06-01
Chris Packham 4 years ago
committed by Stefan Roese
parent
commit
93f4877935
1 changed files with 0 additions and 8 deletions
  1. +0
    -8
      tools/kwboot.c

+ 0
- 8
tools/kwboot.c View File

@@ -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;