Merge branch 'mpc86xx'

[oweals/u-boot.git] / cpu / mcf52x2 / interrupts.c

diff --git a/cpu/mcf52x2/interrupts.c b/cpu/mcf52x2/interrupts.c
index 1836f27167dfe9ad40c0a5b40900955c458340ad..116747ad3aceba5e0e25ee3ba645cda1f9338149 100644 (file)
--- a/cpu/mcf52x2/interrupts.c
+++ b/cpu/mcf52x2/interrupts.c
@@ -27,6 +27,11 @@
 #include <watchdog.h>
 #include <asm/processor.h>
 
+#ifdef CONFIG_M5271
+#include <asm/m5271.h>
+#include <asm/immap_5271.h>
+#endif
+
 #ifdef CONFIG_M5272
 #include <asm/m5272.h>
 #include <asm/immap_5272.h>
@@ -37,6 +42,10 @@
 #include <asm/immap_5282.h>
 #endif
 
+#ifdef CONFIG_M5249
+#include <asm/m5249.h>
+#endif
+
 
 #define        NR_IRQS         31
 
@@ -142,10 +151,11 @@ void int_handler (struct pt_regs *fp)
                irq_vecs[vec -
                         vec_base].handler (irq_vecs[vec - vec_base].arg);
        } else {
-               printf ("\nBogus External Interrupt Vector %ld\n", vec);
+               printf ("\nBogus External Interrupt Vector %d\n", vec);
        }
 }
 
+
 #ifdef CONFIG_M5272
 int interrupt_init (void)
 {
@@ -166,9 +176,18 @@ int interrupt_init (void)
 }
 #endif
 
-#ifdef CONFIG_M5282
+#if defined(CONFIG_M5282) || defined(CONFIG_M5271)
+int interrupt_init (void)
+{
+       return 0;
+}
+#endif
+
+#ifdef CONFIG_M5249
 int interrupt_init (void)
 {
+       enable_interrupts ();
+
        return 0;
 }
 #endif