diff options
| author | Peter Pearse <peter.pearse@arm.com> | 2007-05-18 13:33:23 (GMT) |
|---|---|---|
| committer | Peter Pearse <peter.pearse@arm.com> | 2007-05-18 13:33:23 (GMT) |
| commit | fdda367561f0f6fb21d5b575402c0f9d2fd08e76 (patch) | |
| tree | afb703e6e43ff91e6f456f12fbb43fb598373fd5 /cpu/microblaze/irq.S | |
| parent | 1443a31457d68f7e8f0b9403e9832ec1e79dc59d (diff) | |
| parent | 70124c2602ae2d4c5d3dba05b482d91548242de8 (diff) | |
| download | u-boot-fdda367561f0f6fb21d5b575402c0f9d2fd08e76.tar.xz | |
Merge with git://www.denx.de/git/u-boot.git
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 |