Patchwork [U-Boot] Revert "ARM: move interrupt_init to before relocation"

login
register
mail settings
Submitter Albert ARIBAUD
Date Nov. 8, 2013, 9:37 p.m.
Message ID <1383946653-16990-1-git-send-email-albert.u.boot@aribaud.net>
Download mbox | patch
Permalink /patch/289923/
State Accepted
Delegated to: Albert ARIBAUD
Headers show

Comments

Albert ARIBAUD - Nov. 8, 2013, 9:37 p.m.
Revert commit 0f5141e9 which causes boards starting in
FLASH to try and write to a FLASH location.

Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
---
 arch/arm/lib/board.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Albert ARIBAUD - Dec. 11, 2013, 8:28 p.m.
On Fri,  8 Nov 2013 22:37:33 +0100, Albert ARIBAUD
<albert.u.boot@aribaud.net> wrote:

> Revert commit 0f5141e9 which causes boards starting in
> FLASH to try and write to a FLASH location.
> 
> Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
> ---
>  arch/arm/lib/board.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
> index 34f50b0..9c72a53 100644
> --- a/arch/arm/lib/board.c
> +++ b/arch/arm/lib/board.c
> @@ -435,7 +435,6 @@ void board_init_f(ulong bootflag)
>  	addr_sp += 128;	/* leave 32 words for abort-stack   */
>  	gd->irq_sp = addr_sp;
>  #endif
> -	interrupt_init();
>  
>  	debug("New Stack Pointer is: %08lx\n", addr_sp);
>  
> @@ -637,6 +636,8 @@ void board_init_r(gd_t *id, ulong dest_addr)
>  	misc_init_r();
>  #endif
>  
> +	 /* set up exceptions */
> +	interrupt_init();
>  	/* enable exceptions */
>  	enable_interrupts();
>  

Applied to u-boot-arm/master.

Amicalement,

Patch

diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index 34f50b0..9c72a53 100644
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -435,7 +435,6 @@  void board_init_f(ulong bootflag)
 	addr_sp += 128;	/* leave 32 words for abort-stack   */
 	gd->irq_sp = addr_sp;
 #endif
-	interrupt_init();
 
 	debug("New Stack Pointer is: %08lx\n", addr_sp);
 
@@ -637,6 +636,8 @@  void board_init_r(gd_t *id, ulong dest_addr)
 	misc_init_r();
 #endif
 
+	 /* set up exceptions */
+	interrupt_init();
 	/* enable exceptions */
 	enable_interrupts();