diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-05-17 00:06:11 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-05-17 00:06:11 +0200 |
| commit | 3a71b5ca775fc9cf506c12d91925019591446c7c (patch) | |
| tree | 0eb875a5ed89145e1d73ce411b8e2705a53132bd /cpu/microblaze/irq.S | |
| parent | 3162eb836903c8b247fdc7470dd39bfa6996f495 (diff) | |
| parent | 70124c2602ae2d4c5d3dba05b482d91548242de8 (diff) | |
| download | u-boot-imx-3a71b5ca775fc9cf506c12d91925019591446c7c.zip u-boot-imx-3a71b5ca775fc9cf506c12d91925019591446c7c.tar.gz u-boot-imx-3a71b5ca775fc9cf506c12d91925019591446c7c.tar.bz2 | |
Merge with /home/git/u-boot
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 |