[U-Boot] [PATCH] arch/arm/lib/relocate.S: Remove unreachable code

Tom Rini trini at konsulko.com
Sat Mar 18 01:34:59 UTC 2017


On Fri, Mar 17, 2017 at 09:29:17PM -0400, Tom Rini wrote:

> We support neither xscale nor ARMv4 at this point in time, so remove
> this code.
> 
> Suggested-by: Vikas MANOCHA <vikas.manocha at st.com>
> Signed-off-by: Tom Rini <trini at konsulko.com>
> ---
>  arch/arm/lib/relocate.S | 16 ----------------
>  1 file changed, 16 deletions(-)
> 
> diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S
> index a6fb07c401d4..54c6c23c2185 100644
> --- a/arch/arm/lib/relocate.S
> +++ b/arch/arm/lib/relocate.S
> @@ -110,22 +110,6 @@ fixnext:
>  	blo	fixloop
>  
>  relocate_done:
> -
> -#ifdef __XSCALE__
> -	/*
> -	 * On xscale, icache must be invalidated and write buffers drained,
> -	 * even with cache disabled - 4.2.7 of xscale core developer's manual
> -	 */
> -	mcr	p15, 0, r0, c7, c7, 0	/* invalidate icache */
> -	mcr	p15, 0, r0, c7, c10, 4	/* drain write buffer */
> -#endif
> -
> -	/* ARMv4- don't know bx lr but the assembler fails to see that */
> -
> -#ifdef __ARM_ARCH_4__
> -	mov	pc, lr
> -#else
>  	bx	lr
> -#endif

Actually, sorry, I need to NAK this myself as we do set __ARM_ARCH_4__
it's just that wrt that thumb case where we could clarify the v5-related
thumb parts.

-- 
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/7cb4515d/attachment.sig>


More information about the U-Boot mailing list