summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schmidt <mail@schmidt-andreas.de>2018-04-22 18:41:57 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2018-04-25 11:24:15 +0200
commit9d8c00bdf7c1e8b614a797f0a15fa45bf6387224 (patch)
treed753099f512e598ebe5e0a9c11731b17735aeea4
parente2103491afef9fb16d8d164c3c5559da099c3257 (diff)
downloadbarebox-9d8c00bdf7c1e8b614a797f0a15fa45bf6387224.tar.gz
ARM: arm32: fix realocate_to_curr_addr
After add aarch64 support (commit 868df08038a91d674a0c50b0c0a2f70dbc445510) to realocation, MLO on beaglebone black do not boot any more. The issue is, that addition of offset in one if-case was not done. This patch fix this. Signed-off-by: Andreas Schmidt <mail@schmidt-andreas.de> Tested-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/cpu/common.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/cpu/common.c b/arch/arm/cpu/common.c
index 00ce3ef..51fe7ed 100644
--- a/arch/arm/cpu/common.c
+++ b/arch/arm/cpu/common.c
@@ -85,6 +85,7 @@ void relocate_to_current_adr(void)
unsigned long *fixup = (unsigned long *)(rel->r_offset + offset);
*fixup = *fixup + r + offset;
+ rel->r_offset += offset;
} else {
putc_ll('>');
puthex_ll(rel->r_info);