Hi Tom, > -----Original Message----- > From: U-Boot [mailto:[email protected]] On Behalf Of Tom Rini > Sent: Thursday, March 02, 2017 7:00 AM > To: [email protected] > Cc: Mans Rullgard <[email protected]> > 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 <[email protected]> > Cc: Mans Rullgard <[email protected]> > Signed-off-by: Tom Rini <[email protected]> > --- > 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 > [email protected] > http://lists.denx.de/listinfo/u-boot _______________________________________________ U-Boot mailing list [email protected] https://lists.denx.de/listinfo/u-boot
