public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Albert ARIBAUD <albert.u.boot@aribaud.net>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v3 1/2] cosmetic: arm: fix whitespace in arch/arm/lib/relocate.S
Date: Fri, 21 Nov 2014 10:01:23 +0100	[thread overview]
Message-ID: <20141121100123.4119d5b3@lilith> (raw)
In-Reply-To: <1415897955-9676-2-git-send-email-albert.u.boot@aribaud.net>

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.

  reply	other threads:[~2014-11-21  9:01 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-11 16:46 [U-Boot] [PATCH v1 0/2] Fix SoC-specific exception handling Albert ARIBAUD
2014-11-11 16:46 ` [U-Boot] [PATCH v1 1/2] cosmetic: arm: fix whitespace in arch/arm/lib/relocate.S Albert ARIBAUD
2014-11-11 16:46 ` [U-Boot] [PATCH v1 2/2] imx: fix exception vectors relocation in i.MX27 Albert ARIBAUD
2014-11-11 18:02   ` trem
2014-11-11 18:13     ` Albert ARIBAUD
2014-11-11 18:19 ` [U-Boot] [PATCH v2 0/2] Fix SoC-specific exception handling Albert ARIBAUD
2014-11-11 18:19   ` [U-Boot] [PATCH v2 1/2] cosmetic: arm: fix whitespace in arch/arm/lib/relocate.S Albert ARIBAUD
2014-11-11 18:19   ` [U-Boot] [PATCH v2 2/2] imx: fix exception vectors relocation in imx27 Albert ARIBAUD
2014-11-13 16:59   ` [U-Boot] [PATCH v3 0/2] Fix SoC-specific exception handling Albert ARIBAUD
2014-11-13 16:59     ` [U-Boot] [PATCH v3 1/2] cosmetic: arm: fix whitespace in arch/arm/lib/relocate.S Albert ARIBAUD
2014-11-21  9:01       ` Albert ARIBAUD [this message]
2014-11-21  9:04         ` Albert ARIBAUD
2014-11-13 16:59     ` [U-Boot] [PATCH v3 2/2] imx: fix exception vectors relocation in imx27 Albert ARIBAUD
2014-11-14  9:13       ` Stefano Babic
2014-11-14 11:49         ` Albert ARIBAUD
2014-11-14 12:10           ` Albert ARIBAUD
2014-11-14 13:24             ` Stefano Babic
2014-11-14 21:20               ` Fabio Estevam
2014-11-20 12:08               ` Albert ARIBAUD
2014-11-21  9:08                 ` Stefano Babic
2014-11-14 18:13       ` Philippe Reynes
2014-11-14 18:29       ` Philippe Reynes
2014-11-20  9:35       ` Stefano Babic
2014-11-13 17:05     ` [U-Boot] [PATCH v3 0/2] Fix SoC-specific exception handling Albert ARIBAUD

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20141121100123.4119d5b3@lilith \
    --to=albert.u.boot@aribaud.net \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox