public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Scott McNutt <smcnutt@psyent.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] nios2: consolidate reset initialization
Date: Thu, 22 Apr 2010 22:01:57 -0400	[thread overview]
Message-ID: <4BD0FF95.5000900@psyent.com> (raw)
In-Reply-To: <1271732471-5131-1-git-send-email-thomas@wytron.com.tw>

Applied. Thanks.
--Scott

Thomas Chou wrote:
> Global interrupt should be disabled from the beginning.
> 
> Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
> ---
>  arch/nios2/cpu/start.S |    9 ++++-----
>  1 files changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/nios2/cpu/start.S b/arch/nios2/cpu/start.S
> index 31cd5b0..d1016ea 100644
> --- a/arch/nios2/cpu/start.S
> +++ b/arch/nios2/cpu/start.S
> @@ -34,6 +34,7 @@
>  	.global _start
>  
>  _start:
> +	wrctl	status, r0		/* Disable interrupts */
>  	/* ICACHE INIT -- only the icache line at the reset address
>  	 * is invalidated at reset. So the init must stay within
>  	 * the cache line size (8 words). If GERMS is used, we'll
> @@ -43,10 +44,9 @@ _start:
>  	ori	r4, r0, %lo(CONFIG_SYS_ICACHELINE_SIZE)
>  	movhi	r5, %hi(CONFIG_SYS_ICACHE_SIZE)
>  	ori	r5, r5, %lo(CONFIG_SYS_ICACHE_SIZE)
> -	mov	r6, r0
> -0:	initi	r6
> -	add	r6, r6, r4
> -	bltu	r6, r5, 0b
> +0:	initi	r5
> +	sub	r5, r5, r4
> +	bgt	r5, r0, 0b
>  	br	_except_end	/* Skip the tramp */
>  
>  	/* EXCEPTION TRAMPOLINE -- the following gets copied
> @@ -62,7 +62,6 @@ _except_end:
>  	/* INTERRUPTS -- for now, all interrupts masked and globally
>  	 * disabled.
>  	 */
> -	wrctl	status, r0		/* Disable interrupts */
>  	wrctl	ienable, r0		/* All disabled	*/
>  
>  	/* DCACHE INIT -- if dcache not implemented, initd behaves as

      reply	other threads:[~2010-04-23  2:01 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-20  3:01 [U-Boot] [PATCH] nios2: consolidate reset initialization Thomas Chou
2010-04-23  2:01 ` Scott McNutt [this message]

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=4BD0FF95.5000900@psyent.com \
    --to=smcnutt@psyent.com \
    --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