diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-05-16 00:11:53 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-05-16 00:11:53 +0200 |
| commit | d6022573746856861f86f4f514dd1c1c14aaec9a (patch) | |
| tree | 5d07b2e0f2acdb4e640aeb886f127c7a5c6c47b6 /cpu/microblaze/irq.S | |
| parent | e73865897fe9e2b111d7f9ef32fe428438771b11 (diff) | |
| parent | e69f66c6ebe82bbbd1da766bc4eda40ec7ee5af1 (diff) | |
| download | u-boot-imx-d6022573746856861f86f4f514dd1c1c14aaec9a.zip u-boot-imx-d6022573746856861f86f4f514dd1c1c14aaec9a.tar.gz u-boot-imx-d6022573746856861f86f4f514dd1c1c14aaec9a.tar.bz2 | |
Merge with /home/wd/git/u-boot/custodian/u-boot-microblaze
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 |