Skip to content
Snippets Groups Projects
Commit 0849fe24 authored by Martyn Welch's avatar Martyn Welch
Browse files

Reinstate CONFIG_TEXT_BASE on R-Car Gen3 ULCB


Signed-off-by: default avatarMartyn Welch <martyn.welch@collabora.com>
parent 7bbd1ec3
Branches debian/bookworm
Tags debian/5.9.2-1
2 merge requests!110Update U-Boot in v2024 to v2024.1+dfsg-1+apertis2,!107Update from debian/trixie for apertis/v2025dev1
From: Martyn Welch <martyn.welch@collabora.com>
Date: Thu, 8 Feb 2024 12:38:09 +0000
Subject: ARM: renesas: ulcb: Reinstate CONFIG_TEXT_BASE on R-Car Gen3 ULCB
Upstream commit 0abcc23392db37752a402119fbb55c6b213bc3c set
CONFIG_TEXT_BASE=0x0 as R-Car Gen3 had enabled position independent
builds, however this is resulting in the u-boot-elf.srec file being
generated without this offset and using 24-bit address record fields
rather than 32-bit address record fields. The resulting srec file is
failing to upload/parse with a the error "Program over size Error".
Using objcopy to tweak the srec file as below results in the upload
succeeding and U-Boot being updated (and running correctly):
objcopy -O binary -I srec u-boot-elf.srec u-boot.elf
objcopy -I binary -O srec --srec-forceS3 \
--change-addresses=0x50000000 u-boot.elf u-boot-elf.srec.tweak
As there are many Renesas SKU's and we are unsure as to how sku specific
any firmware is, we are wary of having to upgrade the monitor firmware
and thus are reverting is change to enable srec files to be built as
previously.
Signed-off-by: Martyn Welch <martyn.welch@collabora.com>
---
configs/rcar3_ulcb_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/configs/rcar3_ulcb_defconfig b/configs/rcar3_ulcb_defconfig
index a62b64e..63d6a77 100644
--- a/configs/rcar3_ulcb_defconfig
+++ b/configs/rcar3_ulcb_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_COUNTER_FREQUENCY=16666666
CONFIG_ARCH_CPU_INIT=y
CONFIG_ARCH_RMOBILE=y
+CONFIG_TEXT_BASE=0x50000000
CONFIG_SYS_MALLOC_LEN=0x4000000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_ENV_SIZE=0x20000
......@@ -84,6 +84,7 @@ apertis/am62x/0060-arm-dts-k3-am625-sk-Enable-usb-port-in-u-boot.patch
apertis/am62x/0061-configs-am62x_evm_-Enable-USB-and-DFU-support.patch
apertis/am62x/0062-Add-standalone-AM62x-R5-config-for-USB-DFU-booting.patch
apertis/am62x/0063-We-don-t-want-to-try-to-build-the-final-firmware-ima.patch
apertis/am62x/0064-ARM-renesas-ulcb-Reinstate-CONFIG_TEXT_BASE-on-R-Car.patch
# Support for x86 platform
apertis/x86/0078-X86-Support-for-SCSI-devices-added.patch
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment