[U-Boot] [PATCH] arm: Update our 'ret' assembler macro slightly
Albert ARIBAUD
albert.u.boot at aribaud.net
Tue Mar 7 20:59:41 UTC 2017
Hello Tom,
LGTM.
On Thu, 2 Mar 2017 09:59:30 -0500, Tom Rini <trini at 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 at aribaud.net>
> Cc: Mans Rullgard <mans at mansr.com>
> Signed-off-by: Tom Rini <trini at 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.
More information about the U-Boot
mailing list