commit 0c082cd45a1d3dd1b5775b0a66c8c405d2879613
author Marek Vasut <marek.vasut+renesas@mailbox.org> Sun Jan 12 23:47:45 2025 +0100
committer Marek Vasut <marek.vasut+renesas@mailbox.org> Sat Jan 18 09:29:17 2025 +0100
tree a6dba6b4fef45e1f7dc454b34414a8efca16c4da
parent a80eb6033c18ee1da2ed86cc95e08e90cef8d538

arm64: renesas: Rewrite u-boot-elf.srec base address if PIE for R-Car Gen3

The flash_writer tool and previous recovery tools require the SREC load
address to be 0x5000_0000 . The PIE U-Boot build sets the address to 0x0
instead, so override the address back to make u-boot-elf.srec compatible
with the recovery tools.

Tested-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>

Makefile

diff --git a/Makefile b/Makefile
index 0500eb6..c731895 100644
--- a/Makefile
+++ b/Makefile
@@ -1286,6 +1286,15 @@
 
 OBJCOPYFLAGS_u-boot-elf.srec := $(OBJCOPYFLAGS_u-boot.srec)
 
+ifeq ($(CONFIG_POSITION_INDEPENDENT)$(CONFIG_RCAR_GEN3),yy)
+# The flash_writer tool and previous recovery tools
+# require the SREC load address to be 0x5000_0000 .
+# The PIE U-Boot build sets the address to 0x0, so
+# override the address back to make u-boot-elf.srec
+# compatible with the recovery tools.
+OBJCOPYFLAGS_u-boot-elf.srec += --change-addresses=0x50000000
+endif
+
 u-boot-elf.srec: u-boot.elf FORCE
 	$(call if_changed,objcopy)