From fba5573e7835cd8d59cda49e22bc7bfe41f4c69b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pali=20Roh=C3=A1r?= Date: Thu, 23 Mar 2023 20:57:51 +0100 Subject: [PATCH] tools: kwbimage: Fix invalid UART kwbimage v1 headersz MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Armada 385 BootROM ignores low 7 bits of headersz when parsing kwbimage header of UART type, which effectively means that headersz is rounded down to multiply of 128 bytes. For all other image types BootROM reads and use all bits of headersz. Therefore fill into UART type of kwbimage v1 headersz aligned to 128 bytes. Fixes: bb79e11f257d ("tools: kwbimage: Fill the real header size into the main header") Signed-off-by: Pali Rohár Reviewed-by: Stefan Roese --- tools/kwbimage.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/kwbimage.c b/tools/kwbimage.c index 309657a563..177084adf8 100644 --- a/tools/kwbimage.c +++ b/tools/kwbimage.c @@ -1231,6 +1231,16 @@ static size_t image_headersz_v1(int *hasext) if (count > 0) headersz += sizeof(struct register_set_hdr_v1) + 8 * count + 4; + /* + * For all images except UART, headersz stored in header itself should + * contains header size without padding. For UART image BootROM rounds + * down headersz to multiply of 128 bytes. Therefore align UART headersz + * to multiply of 128 bytes to ensure that remaining UART header bytes + * are not ignored by BootROM. + */ + if (image_get_bootfrom() == IBR_HDR_UART_ID) + headersz = ALIGN(headersz, 128); + return headersz; } -- 2.39.5