| Message ID | 20211022103748.25651-3-pali@kernel.org |
|---|---|
| State | Accepted |
| Commit | 0089f61e2dad50650d848ce8625d2b2141f56984 |
| Delegated to: | Stefan Roese |
| Headers | show |
| Series | arm: mvebu: nandpagesize support for kwbimage v1 | expand |
On 22.10.21 12:37, Pali Rohár wrote: > kwbimage v1 has also nandpagesize field. So set it to zero for both image > versions when image is not signed. > > Signed-off-by: Pali Rohár <pali@kernel.org> Reviewed-by: Stefan Roese <sr@denx.de> Thanks, Stefan > --- > tools/kwboot.c | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/tools/kwboot.c b/tools/kwboot.c > index eb4f5ab87917..7e1be2962302 100644 > --- a/tools/kwboot.c > +++ b/tools/kwboot.c > @@ -1428,13 +1428,6 @@ kwboot_img_patch(void *img, size_t *size, int baudrate) > if (csum != hdr->checksum) > goto err; > > - if (image_ver == 0) { > - struct main_hdr_v0 *hdr_v0 = img; > - > - hdr_v0->nandeccmode = IBR_HDR_ECC_DISABLED; > - hdr_v0->nandpagesize = 0; > - } > - > srcaddr = le32_to_cpu(hdr->srcaddr); > > switch (hdr->blockid) { > @@ -1480,6 +1473,12 @@ kwboot_img_patch(void *img, size_t *size, int baudrate) > hdr->blockid = IBR_HDR_UART_ID; > } > > + if (!is_secure) { > + if (image_ver == 0) > + ((struct main_hdr_v0 *)img)->nandeccmode = IBR_HDR_ECC_DISABLED; > + hdr->nandpagesize = 0; > + } > + > if (baudrate) { > uint32_t codesz = sizeof(kwboot_baud_code); > void *code; > Viele Grüße, Stefan
diff --git a/tools/kwboot.c b/tools/kwboot.c index eb4f5ab87917..7e1be2962302 100644 --- a/tools/kwboot.c +++ b/tools/kwboot.c @@ -1428,13 +1428,6 @@ kwboot_img_patch(void *img, size_t *size, int baudrate) if (csum != hdr->checksum) goto err; - if (image_ver == 0) { - struct main_hdr_v0 *hdr_v0 = img; - - hdr_v0->nandeccmode = IBR_HDR_ECC_DISABLED; - hdr_v0->nandpagesize = 0; - } - srcaddr = le32_to_cpu(hdr->srcaddr); switch (hdr->blockid) { @@ -1480,6 +1473,12 @@ kwboot_img_patch(void *img, size_t *size, int baudrate) hdr->blockid = IBR_HDR_UART_ID; } + if (!is_secure) { + if (image_ver == 0) + ((struct main_hdr_v0 *)img)->nandeccmode = IBR_HDR_ECC_DISABLED; + hdr->nandpagesize = 0; + } + if (baudrate) { uint32_t codesz = sizeof(kwboot_baud_code); void *code;
kwbimage v1 has also nandpagesize field. So set it to zero for both image versions when image is not signed. Signed-off-by: Pali Rohár <pali@kernel.org> --- tools/kwboot.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)