From mboxrd@z Thu Jan  1 00:00:00 1970
From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Fri, 21 Nov 2014 10:01:23 +0100
Subject: [U-Boot] [PATCH v3 1/2] cosmetic: arm: fix whitespace in
 arch/arm/lib/relocate.S
In-Reply-To: <1415897955-9676-2-git-send-email-albert.u.boot@aribaud.net>
References: <1415897955-9676-1-git-send-email-albert.u.boot@aribaud.net>
	<1415897955-9676-2-git-send-email-albert.u.boot@aribaud.net>
Message-ID: <20141121100123.4119d5b3@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

On Thu, 13 Nov 2014 17:59:14 +0100, Albert ARIBAUD
<albert.u.boot@aribaud.net> wrote:
> Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
> ---
> 
> Changes in v3: None
> Changes in v2: None
> 
>  arch/arm/lib/relocate.S | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S
> index b4a258c..6ede41c 100644
> --- a/arch/arm/lib/relocate.S
> +++ b/arch/arm/lib/relocate.S
> @@ -74,8 +74,8 @@ fixnext:
>  	ldr	r0, [r9, #GD_RELOCADDR]	/* r0 = gd->relocaddr */
>  	mrc	p15, 0, r2, c1, c0, 0	/* V bit (bit[13]) in CP15 c1 */
>  	ands	r2, r2, #(1 << 13)
> -	ldreq	r1, =0x00000000 	/* If V=0 */
> -	ldrne	r1, =0xFFFF0000 	/* If V=1 */
> +	ldreq	r1, =0x00000000		/* If V=0 */
> +	ldrne	r1, =0xFFFF0000		/* If V=1 */
>  	ldmia	r0!, {r2-r8,r10}
>  	stmia	r1!, {r2-r8,r10}
>  	ldmia	r0!, {r2-r8,r10}
> @@ -96,9 +96,9 @@ relocate_done:
>  	/* ARMv4- don't know bx lr but the assembler fails to see that */
>  
>  #ifdef __ARM_ARCH_4__
> -	mov        pc, lr
> +	mov	pc, lr
>  #else
> -	bx        lr
> +	bx	lr
>  #endif
>  
>  ENDPROC(relocate_code)
> -- 
> 2.1.0

Applied to u-boot-arm/master.

Amicalement,
-- 
Albert.