[U-Boot] [PATCH] arch/arm/lib/relocate.S: Remove unreachable code

Tom Rini trini at konsulko.com
Sat Mar 18 01:29:17 UTC 2017


We support neither xscale nor ARMv4 at this point in time, so remove
this code.

Suggested-by: Vikas MANOCHA <vikas.manocha at st.com>
Signed-off-by: Tom Rini <trini at konsulko.com>
---
 arch/arm/lib/relocate.S | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S
index a6fb07c401d4..54c6c23c2185 100644
--- a/arch/arm/lib/relocate.S
+++ b/arch/arm/lib/relocate.S
@@ -110,22 +110,6 @@ fixnext:
 	blo	fixloop
 
 relocate_done:
-
-#ifdef __XSCALE__
-	/*
-	 * On xscale, icache must be invalidated and write buffers drained,
-	 * even with cache disabled - 4.2.7 of xscale core developer's manual
-	 */
-	mcr	p15, 0, r0, c7, c7, 0	/* invalidate icache */
-	mcr	p15, 0, r0, c7, c10, 4	/* drain write buffer */
-#endif
-
-	/* ARMv4- don't know bx lr but the assembler fails to see that */
-
-#ifdef __ARM_ARCH_4__
-	mov	pc, lr
-#else
 	bx	lr
-#endif
 
 ENDPROC(relocate_code)
-- 
1.9.1



More information about the U-Boot mailing list