[U-Boot] [PATCH 1/3] ARM: relocate: fix hang when CONFIG_ARMV7_SECURE_BASE

Frank Li Frank.Li at freescale.com
Wed Oct 7 00:13:24 CEST 2015


When added above configuration, iram fix up plus relocate offset may locate
in invalidate space. Write back fix up value will cause data abort.

Add address check, skip psci code.

Signed-off-by: Frank Li <Frank.Li at freescale.com>
---
 arch/arm/lib/relocate.S | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S
index 475d503..6795a1b 100644
--- a/arch/arm/lib/relocate.S
+++ b/arch/arm/lib/relocate.S
@@ -99,6 +99,10 @@ fixloop:
 	cmp	r1, #23			/* relative fixup? */
 	bne	fixnext
 
+	ldr	r1, =__image_copy_start
+	cmp	r0, r1
+	blo	fixnext
+
 	/* relative fix: increase location by offset */
 	add	r0, r0, r4
 	ldr	r1, [r0]
-- 
2.5.2



More information about the U-Boot mailing list