diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-06-30 10:10:32 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-06-30 10:10:32 +0200 |
| commit | 39ddd10b046fb791f47281ffb2100be01909ad72 (patch) | |
| tree | cec01ecc6502a65cbbbda406dfac23b93c093899 /arch/avr32/cpu/start.S | |
| parent | 55357b7846237d12aa5f07aec657c5dbfaf790ed (diff) | |
| parent | 0a9463e93537a68e7246714f43fb69eca0b7b214 (diff) | |
Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
Diffstat (limited to 'arch/avr32/cpu/start.S')
| -rw-r--r-- | arch/avr32/cpu/start.S | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/avr32/cpu/start.S b/arch/avr32/cpu/start.S index d37a46eb18..99c9e06cb8 100644 --- a/arch/avr32/cpu/start.S +++ b/arch/avr32/cpu/start.S @@ -27,9 +27,10 @@ #define SYSREG_MMUCR_S_OFFSET 4 #define SR_INIT (SYSREG_BIT(GM) | SYSREG_BIT(EM) | SYSREG_BIT(M0)) -#define CPUCR_INIT (SYSREG_BIT(BI) | SYSREG_BIT(BE) \ - | SYSREG_BIT(FE) | SYSREG_BIT(RE) \ - | SYSREG_BIT(IBE) | SYSREG_BIT(IEE)) +/* due to errata (unreliable branch folding) clear FE bit explicitly */ +#define CPUCR_INIT ((SYSREG_BIT(BI) | SYSREG_BIT(BE) \ + | SYSREG_BIT(RE) | SYSREG_BIT(IBE) \ + | SYSREG_BIT(IEE)) & ~SYSREG_BIT(FE)) /* * To save some space, we use the same entry point for |