diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-03-07 10:04:07 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-03-21 12:22:59 +0100 |
| commit | a43e2bbc468a71fb8825e8acafb7fac7ad7c6dad (patch) | |
| tree | 9f250072ef45f63cfabbe85a6fd93a6b87299787 /arch/arm/mach-mvebu | |
| parent | ff7d9b9e97df59d010ca6299b4b96ffef42df935 (diff) | |
| download | barebox-a43e2bbc468a71fb8825e8acafb7fac7ad7c6dad.tar.gz barebox-a43e2bbc468a71fb8825e8acafb7fac7ad7c6dad.tar.xz | |
ARM: return positive offset in get_runtime_offset()
When we are linked at 0x0 and running at 0x01000000 then
get_runtime_offset() should return 0x01000000 and not 0xff000000. This
makes get_runtime_offset() more consistent and better understandable.
This was tested on a Freescale i.MX53 Quickstart board. Additionally
relocate_to_adr() was tested since that is normally not called.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mvebu')
| -rw-r--r-- | arch/arm/mach-mvebu/include/mach/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mvebu/include/mach/common.h b/arch/arm/mach-mvebu/include/mach/common.h index 529eb61cfd..aa4babcfa7 100644 --- a/arch/arm/mach-mvebu/include/mach/common.h +++ b/arch/arm/mach-mvebu/include/mach/common.h @@ -30,7 +30,7 @@ uint32_t get_runtime_offset(void); static inline void __iomem *mvebu_get_initial_int_reg_base(void) { #ifdef __PBL__ - u32 base = __get_unaligned_le32(_text - get_runtime_offset() + 0x30); + u32 base = __get_unaligned_le32(_text + get_runtime_offset() + 0x30); return (void __force __iomem *)base; #else return (void __force __iomem *)MVEBU_REMAP_INT_REG_BASE; |