tools: kwboot: Fix patching of SPI/NOR XIP images

Marvell BootROM interprets execaddr of SPI/NOR XIP images as relative byte
offset from the from the beginning of the flash device. So if data image
offset and execute offset are not same then it is needed to adjust them
also in DDR RAM.

Fixes: f2c644e0b8bc ("tools: kwboot: Patch destination address to DDR area for SPI image")
Signed-off-by: Pali Rohár <pali@kernel.org>

diff --git a/tools/kwboot.c b/tools/kwboot.c
index f624edc..cb31d5b 100644 (file)
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -2022,8 +2022,8 @@ kwboot_img_patch(void *img, size_t *size, int baudrate)
        case IBR_HDR_SPI_ID:
                if (hdr->destaddr == cpu_to_le32(0xFFFFFFFF)) {
                        kwboot_printv("Patching destination and execution addresses from SPI/NOR XIP area to DDR area 0x00800000\n");
-                       hdr->destaddr = cpu_to_le32(0x00800000);
-                       hdr->execaddr = cpu_to_le32(0x00800000);
+                       hdr->destaddr = cpu_to_le32(0x00800000 + le32_to_cpu(hdr->srcaddr));
+                       hdr->execaddr = cpu_to_le32(0x00800000 + le32_to_cpu(hdr->execaddr));
                }
                break;
        }