From e10a45752fe77a1e6fc75e254947dadc3db633ec Mon Sep 17 00:00:00 2001 From: Jessica Clarke Date: Thu, 10 Jul 2025 01:29:35 +0100 Subject: [PATCH] firmware: Rename __rel_dyn_start/end to __rela_dyn_start/end We are using and expecting the RELA format, not the REL format, and this is the conventional linker-generated name for the start/end symbols, so use it rather than confusing things by making it look like we're accessing .rel.dyn, which would be in the REL format with no explicit addend. Signed-off-by: Jessica Clarke Reviewed-by: Samuel Holland Tested-by: Samuel Holland Link: https://lore.kernel.org/r/20250710002937.44307-1-jrtc27@jrtc27.com Signed-off-by: Anup Patel --- firmware/fw_base.S | 4 ++-- firmware/fw_base.ldS | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/firmware/fw_base.S b/firmware/fw_base.S index a008fa74..9e2c017c 100644 --- a/firmware/fw_base.S +++ b/firmware/fw_base.S @@ -76,8 +76,8 @@ _sc_fail: li t0, FW_TEXT_START /* link start */ lla t1, _fw_start /* load start */ sub t2, t1, t0 /* load offset */ - lla t0, __rel_dyn_start - lla t1, __rel_dyn_end + lla t0, __rela_dyn_start + lla t1, __rela_dyn_end beq t0, t1, _relocate_done 2: REG_L t5, REGBYTES(t0) /* t5 <-- relocation info:type */ diff --git a/firmware/fw_base.ldS b/firmware/fw_base.ldS index a33746a0..12c7a844 100644 --- a/firmware/fw_base.ldS +++ b/firmware/fw_base.ldS @@ -47,9 +47,9 @@ . = ALIGN(0x1000); /* Ensure next section is page aligned */ .rela.dyn : { - PROVIDE(__rel_dyn_start = .); + PROVIDE(__rela_dyn_start = .); *(.rela*) - PROVIDE(__rel_dyn_end = .); + PROVIDE(__rela_dyn_end = .); } PROVIDE(_rodata_end = .);