From: Tom Rini <trini@konsulko.com>
Date: Thu, 2 Mar 2017 14:59:30 +0000 (-0500)
Subject: arm: Update our 'ret' assembler macro slightly
X-Git-Tag: v2017.05-rc1~67
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=431afb4ef9fe89e5350b5d497be4c5f8d270393e;p=u-boot

arm: Update our 'ret' assembler macro slightly

We only support cores that do Thumb-1 or later.  So we add a comment to
explain this and remove the architecture test.

Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Cc: Mans Rullgard <mans@mansr.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---

diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
index c56daf2a1f..d24be2d484 100644
--- a/arch/arm/include/asm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
@@ -57,17 +57,17 @@
 #define PLD(code...)
 #endif
 
+/*
+ * We only support cores that support at least Thumb-1 and thus we use
+ * 'bx lr'
+ */
 	.irp	c,,eq,ne,cs,cc,mi,pl,vs,vc,hi,ls,ge,lt,gt,le,hs,lo
 	.macro	ret\c, reg
-#if defined(__ARM_ARCH_5E__)
-	mov\c	pc, \reg
-#else
 	.ifeqs	"\reg", "lr"
 	bx\c	\reg
 	.else
 	mov\c	pc, \reg
 	.endif
-#endif
 	.endm
 	.endr