Merge branch 'master' of git://git.denx.de/u-boot-samsung

[platform/kernel/u-boot.git] / arch / arm / lib / vectors.S

diff --git a/arch/arm/lib/vectors.S b/arch/arm/lib/vectors.S
index f53b1e9..1019091 100644 (file)
--- a/arch/arm/lib/vectors.S
+++ b/arch/arm/lib/vectors.S
@@ -117,7 +117,6 @@ data_abort:
 not_used:
 irq:
 fiq:
-
 1:
        bl      1b                      /* hang and never return */
 
@@ -126,7 +125,11 @@ fiq:
 /* IRQ stack memory (calculated at run-time) + 8 bytes */
 .globl IRQ_STACK_START_IN
 IRQ_STACK_START_IN:
+#ifdef IRAM_BASE_ADDR
+       .word   IRAM_BASE_ADDR + 0x20
+#else
        .word   0x0badc0de
+#endif
 
 @
 @ IRQ stack frame.