From mboxrd@z Thu Jan  1 00:00:00 1970
From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Tue, 7 Mar 2017 21:59:41 +0100
Subject: [U-Boot] [PATCH] arm: Update our 'ret' assembler macro slightly
In-Reply-To: <1488466770-6323-1-git-send-email-trini@konsulko.com>
References: <1488466770-6323-1-git-send-email-trini@konsulko.com>
Message-ID: <20170307215941.113a4c5b@lilith>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

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.