Commit c312908a authored Apr 16, 2013 by Stephen Warren Committed by Olof Johansson Apr 18, 2013

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: Joseph Lo <josephl@nvidia.com>
Suggested-by: Dave Martin <dave.martin@linaro.org>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Olof Johansson <olof@lixom.net>

parent a65dc10f

arch/arm/mach-tegra/sleep.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -92,7 +92,7 @@

		#ifdef CONFIG_CACHE_L2X0
		.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 \tmp2, [\tmp1, #L2X0_R_PHY_BASE]
		ldr \tmp3, [\tmp2, #L2X0_CTRL]