[U-Boot] [PATCH] arm: Update our 'ret' assembler macro slightly

[U-Boot] [PATCH] arm: Update our 'ret' assembler macro slightly

[Tom Rini]

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>
---
 arch/arm/include/asm/assembler.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
index c56daf2a1f69..d24be2d484fe 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
 
-- 
1.9.1

[U-Boot] [PATCH] arm: Update our 'ret' assembler macro slightly

[Albert ARIBAUD]

Hello Tom,

LGTM.

On Thu,  2 Mar 2017 09:59:30 -0500, Tom Rini <trini@konsulko.com> wrote:
> 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>
> ---
>  arch/arm/include/asm/assembler.h | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
> index c56daf2a1f69..d24be2d484fe 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
>  
> -- 
> 1.9.1
> 



Amicalement,
-- 
Albert.

[U-Boot] [PATCH] arm: Update our 'ret' assembler macro slightly

[Vikas MANOCHA]

Hi Tom,

> -----Original Message-----
> From: U-Boot [mailto:u-boot-bounces at lists.denx.de] On Behalf Of Tom Rini
> Sent: Thursday, March 02, 2017 7:00 AM
> To: u-boot at lists.denx.de
> Cc: Mans Rullgard <mans@mansr.com>
> Subject: [U-Boot] [PATCH] 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.

We can remove the same support for __ARM_ARCH_4__  from arch/arm/lib/relocate.S also.
Also the __ARM_ARCH_5*__  usage for PLD define in same assembler.h.

Cheers,
Vikas

> 
> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
> Cc: Mans Rullgard <mans@mansr.com>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
>  arch/arm/include/asm/assembler.h | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
> index c56daf2a1f69..d24be2d484fe 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
> 
> --
> 1.9.1
> 
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/listinfo/u-boot

[U-Boot] arm: Update our 'ret' assembler macro slightly

[Tom Rini]

On Thu, Mar 02, 2017 at 09:59:30AM -0500, Tom Rini wrote:

> 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>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170317/bfba53a9/attachment.sig>