diff options
| author | Tom Rini <trini@konsulko.com> | 2017-03-02 17:59:30 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-03-17 21:15:11 +0300 |
| commit | 431afb4ef9fe89e5350b5d497be4c5f8d270393e (patch) | |
| tree | 9ea7e941b5786d487fe0cf22bda6f8db5c99ec4c /arch/arm/include/asm/assembler.h | |
| parent | 9da52f8f67b32a21a687602681f6b6b6b7df480b (diff) | |
| download | u-boot-431afb4ef9fe89e5350b5d497be4c5f8d270393e.tar.xz | |
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>
Diffstat (limited to 'arch/arm/include/asm/assembler.h')
| -rw-r--r-- | arch/arm/include/asm/assembler.h | 8 |
1 files changed, 4 insertions, 4 deletions
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 |