Commit c312908a authored by Stephen Warren's avatar Stephen Warren Committed by Olof Johansson

ARM: tegra: solve adr range issue with THUMB2_KERNEL enabled

When building the kernel with CONFIG_THUMB2_KERNEL enabled, older
assemblers may emit the following error:

reset-handler.S:78: Error: invalid immediate for address calculation (value = 0x00000004)

Using an explicit adr.w instruction will solve this. Newer assemblers do
this automatically. Use the W() macro to do this under Thumb mode only.
Inspired-by: default avatarJoseph Lo <josephl@nvidia.com>
Suggested-by: default avatarDave Martin <dave.martin@linaro.org>
Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent a65dc10f
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
#ifdef CONFIG_CACHE_L2X0 #ifdef CONFIG_CACHE_L2X0
.macro l2_cache_resume, tmp1, tmp2, tmp3, phys_l2x0_saved_regs .macro l2_cache_resume, tmp1, tmp2, tmp3, phys_l2x0_saved_regs
adr \tmp1, \phys_l2x0_saved_regs W(adr) \tmp1, \phys_l2x0_saved_regs
ldr \tmp1, [\tmp1] ldr \tmp1, [\tmp1]
ldr \tmp2, [\tmp1, #L2X0_R_PHY_BASE] ldr \tmp2, [\tmp1, #L2X0_R_PHY_BASE]
ldr \tmp3, [\tmp2, #L2X0_CTRL] ldr \tmp3, [\tmp2, #L2X0_CTRL]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment