diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2007-05-29 16:37:57 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@pollux.denx.de> | 2007-05-29 16:37:57 +0200 |
| commit | 51d8e813222fa3063d423220f6ff1146df58a471 (patch) | |
| tree | a4951077af841bd87a90854b7fb390d12e37b851 /cpu/microblaze/irq.S | |
| parent | 3a619dd7bed03e8b4d22a3911f90fd12af5376c2 (diff) | |
| parent | 19bf91f9628f80a55d4f171df71041574882b3d6 (diff) | |
| download | u-boot-imx-51d8e813222fa3063d423220f6ff1146df58a471.zip u-boot-imx-51d8e813222fa3063d423220f6ff1146df58a471.tar.gz u-boot-imx-51d8e813222fa3063d423220f6ff1146df58a471.tar.bz2 | |
Merge git://www.denx.de/git/u-boot into 2007_05_15-testing
Diffstat (limited to 'cpu/microblaze/irq.S')
| -rwxr-xr-x[-rw-r--r--] | cpu/microblaze/irq.S | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cpu/microblaze/irq.S b/cpu/microblaze/irq.S index a4e3fbf..e1fc190 100644..100755 --- a/cpu/microblaze/irq.S +++ b/cpu/microblaze/irq.S @@ -23,6 +23,7 @@ */ #include <config.h> +#include <asm/asm.h> .text .global _interrupt_handler _interrupt_handler: @@ -151,6 +152,11 @@ _interrupt_handler: addi r1, r1, 4 /* enable_interrupt */ +#ifdef XILINX_USE_MSR_INSTR + msrset r0, 2 +#else + /* FIXME unstable in stressed mode - two irqs */ + nop addi r1, r1, -4 swi r12, r1, 0 mfs r12, rmsr @@ -159,6 +165,7 @@ _interrupt_handler: lwi r12, r1, 0 addi r1, r1, 4 nop +#endif bra r14 nop nop |