Merge branch '080208_dupint' of git://linux-arm.org/u-boot-armdev

[oweals/u-boot.git] / cpu / bf533 / interrupt.S

diff --git a/cpu/bf533/interrupt.S b/cpu/bf533/interrupt.S
index 524da8f511ce1157c887f594ef5d0ef6a41657ca..7556ec9fbd043f14b04cdc32e0509ec992c8fb31 100644 (file)
--- a/cpu/bf533/interrupt.S
+++ b/cpu/bf533/interrupt.S
@@ -1,7 +1,7 @@
 /*
  * U-boot - interrupt.S Processing of interrupts and exception handling
  *
- * Copyright (c) 2005 blackfin.uclinux.org
+ * Copyright (c) 2005-2007 Analog Devices Inc.
  *
  * (C) Copyright 2000-2004
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@ -35,16 +35,14 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
  */
 
 #define ASSEMBLY
 #include <config.h>
 #include <asm/blackfin.h>
-#include <asm/hw_irq.h>
 #include <asm/entry.h>
-#include <asm/blackfin_defs.h>
 
 .global _blackfin_irq_panic;
 
@@ -55,7 +53,7 @@
 .global _evt_emulation
 _evt_emulation:
        SAVE_CONTEXT
-       r0 = IRQ_EMU;
+       r0 = 0;
        r1 = seqstat;
        sp += -12;
        call _blackfin_irq_panic;
@@ -66,7 +64,7 @@ _evt_emulation:
 .global _evt_nmi
 _evt_nmi:
        SAVE_CONTEXT
-       r0 = IRQ_NMI;
+       r0 = 2;
        r1 = RETN;
        sp += -12;
        call _blackfin_irq_panic;
@@ -88,7 +86,7 @@ _trap:
 .global _evt_rst
 _evt_rst:
        SAVE_CONTEXT
-       r0 = IRQ_RST;
+       r0 = 1;
        r1 = RETN;
        sp += -12;
        call _do_reset;
@@ -98,7 +96,7 @@ _evt_rst_exit:
        rtn;
 
 irq_panic:
-       r0 = IRQ_EVX;
+       r0 = 3;
        r1 =  sp;
        sp += -12;
        call _blackfin_irq_panic;
@@ -115,7 +113,7 @@ _evt_ivhw_exit:
 .global _evt_timer
 _evt_timer:
        SAVE_CONTEXT
-       r0 = IRQ_CORETMR;
+       r0 = 6;
        sp += -12;
        /* Polling method used now. */
        /* call timer_int; */