tools: kwboot: Fix invalid UART kwbimage v1 headersz

Ensure that UART aligned header size is always stored into kwbimage v1
header. It is needed for proper UART booting. Calculation of headersz field
was broken in commit d656f5a0ee22 ("tools: kwboot: Calculate real used
space in kwbimage header when calling kwboot_img_grow_hdr()") which
introduced optimization of kwboot_img_grow_hdr() function.

Fixes: d656f5a0ee22 ("tools: kwboot: Calculate real used space in kwbimage header when calling kwboot_img_grow_hdr()")
Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 7c666486f31f193104a92f6b0ddcb76de10f8be3..ef108c8395b857c5fe8b47699f83ec8a7bd8a7fb 100644 (file)
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -2168,6 +2168,17 @@ kwboot_img_patch(void *img, size_t *size, int baudrate)
 
                kwboot_printv("Aligning image header to Xmodem block size\n");
                kwboot_img_grow_hdr(img, size, grow);
+               hdrsz += grow;
+
+               /*
+                * kwbimage v1 contains header size field and for UART type it
+                * must be set to the aligned xmodem header size because BootROM
+                * rounds header size down to xmodem block size.
+                */
+               if (kwbimage_version(img) == 1) {
+                       hdr->headersz_msb = hdrsz >> 16;
+                       hdr->headersz_lsb = cpu_to_le16(hdrsz & 0xffff);
+               }
        }
 
        hdr->checksum = kwboot_hdr_csum8(hdr) - csum;