Skip to contentSkip to conversation

Revert "ARM: move interrupt_init to before relocation"

PATCH New Albert ARIBAUD 1 participant 2 messages Nov 8, 2013 – Dec 11, 2013 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 arch/arm/lib/board.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/lib/board.c +2 -1
index 34f50b0..9c72a53 100644
@@ -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();
 
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 1/1 Revert "ARM: move interrupt_init to before relocation"

Quoted 21 lines · Albert ARIBAUD

Revert commit 0f5141e9 which causes boards starting in FLASH to try and write to a FLASH location.

---
 arch/arm/lib/board.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/lib/board.c +0 -1
index 34f50b0..9c72a53 100644
@@ -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);
 

arch/arm/lib/board.c void board_init_r(gd_t *id, ulong dest_addr) · line 643

Quoted 8 lines
arch/arm/lib/board.c +2 -0
@@ -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,

Signature · 1 line
Albert.