tools: kwboot: Patch destination address to DDR area for SPI image

SPI/NOR kwbimage may have destination address set to 0xFFFFFFFF, which
means that the image is not downloaded to DDR but rather it is executed
directly from SPI/NOR. In this case execution address is set to SPI/NOR
area.

When patching image to UART type, change destination and execution
addresses from SPI/NOR XIP area to DDR area 0x00800000 (which is default
for A38x).

Signed-off-by: Pali Rohár <pali@kernel.org>
[ refactored ]
Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/tools/kwboot.c b/tools/kwboot.c
index 907a574bfc28154740ff8849851616b5409386ab..b1dcd3796ce69fbcf0a39a01b58eea5ecc62ad67 100644 (file)
--- a/tools/kwboot.c
+++ b/tools/kwboot.c
@@ -836,6 +836,14 @@ kwboot_img_patch_hdr(void *img, size_t size)
                if (srcaddr == 0xFFFFFFFF)
                        hdr->srcaddr = cpu_to_le32(hdrsz);
                break;
+
+       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);
+               }
+               break;
        }
 
        is_secure = kwboot_img_is_secure(img);