From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Fri, 8 Nov 2013 21:37:33 +0000 (+0100)
Subject: Revert "ARM: move interrupt_init to before relocation"
X-Git-Tag: v2014.01-rc3~9^2~86
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bd851c7a26b39309052b2359dc1994127f518534;p=oweals%2Fu-boot.git

Revert "ARM: move interrupt_init to before relocation"

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>
---

diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index 34f50b08a5..9c72a5353f 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();