tools: kwboot: Fix parsing SDIO kwbimage

Despite the official specification, Marvell BootROM does not interpret
srcaddr from SDIO image as offset in number of sectors (like for SATA
image), but as offset in bytes (like for all other images except SATA).

To parse SDIO kwbimage in the same way as Marvell BootROM, it is needed to
interpret srcaddr in bytes. This change fixes loading of SDIO images via
kwboot over UART.

Fixes: 792e42355083 ("tools: kwboot: Patch source address in image header")
Signed-off-by: Pali Rohár <pali@kernel.org>

diff --git a/tools/kwboot.c b/tools/kwboot.c
index da4fe32da2267b50301321651cd0d6cad0ba774d..188f944263fa201a9effaef076a9879ead9a0037 100644 (file)
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -1894,10 +1894,6 @@ kwboot_img_patch(void *img, size_t *size, int baudrate)
                hdr->srcaddr = cpu_to_le32((srcaddr - 1) * 512);
                break;
 
-       case IBR_HDR_SDIO_ID:
-               hdr->srcaddr = cpu_to_le32(srcaddr * 512);
-               break;
-
        case IBR_HDR_PEX_ID:
                if (srcaddr == 0xFFFFFFFF)
                        hdr->srcaddr = cpu_to_le32(hdrsz);