diff options
author | Wolfgang Denk <wd@denx.de> | 2009-03-23 10:41:46 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-03-23 10:41:46 +0100 |
commit | 4ace2823bc1fcc96874069a9a8c0821ff4f95f5d (patch) | |
tree | 12073fe32a64a2acf3c8e41ef5435526ae712651 /lib_avr32/interrupts.c | |
parent | 181c3e46f81e5564cc43ab69adf450fb5b66eab4 (diff) | |
parent | 1129b14e549c8629cbff8c19cb650cc431211868 (diff) | |
download | u-boot-imx-4ace2823bc1fcc96874069a9a8c0821ff4f95f5d.zip u-boot-imx-4ace2823bc1fcc96874069a9a8c0821ff4f95f5d.tar.gz u-boot-imx-4ace2823bc1fcc96874069a9a8c0821ff4f95f5d.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-avr32
Diffstat (limited to 'lib_avr32/interrupts.c')
-rw-r--r-- | lib_avr32/interrupts.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib_avr32/interrupts.c b/lib_avr32/interrupts.c index 28df20d..bbbc490 100644 --- a/lib_avr32/interrupts.c +++ b/lib_avr32/interrupts.c @@ -35,5 +35,12 @@ int disable_interrupts(void) sr = sysreg_read(SR); asm volatile("ssrf %0" : : "n"(SYSREG_GM_OFFSET)); +#ifdef CONFIG_AT32UC3A0xxx + /* Two NOPs are required after masking interrupts on the + * AT32UC3A0512ES. See errata 41.4.5.5. */ + asm("nop"); + asm("nop"); +#endif + return !SYSREG_BFEXT(GM, sr); } |