diff options
| author | Stefan Roese <sr@denx.de> | 2007-05-18 11:20:02 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-05-18 11:20:02 +0200 |
| commit | ee96088ca59d871ec096aefce04b741d1b02cb30 (patch) | |
| tree | 6a97720507c4bbd57ec5f6a8faf09e0971e5449d /cpu/microblaze/irq.S | |
| parent | ada4697d0230d6da552867777f98a67ec3ba2579 (diff) | |
| parent | 70124c2602ae2d4c5d3dba05b482d91548242de8 (diff) | |
| download | blackbird-obmc-uboot-ee96088ca59d871ec096aefce04b741d1b02cb30.tar.gz blackbird-obmc-uboot-ee96088ca59d871ec096aefce04b741d1b02cb30.zip | |
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 a4e3fbfad6..e1fc19046c 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 |
