diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-12-27 00:46:17 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-12-27 00:46:17 +0100 |
| commit | 58bbc77eb0a01033803264539d2c76c242cba210 (patch) | |
| tree | 0c765d85c471a15a721b7226379a22809bed958c /lib_avr32 | |
| parent | 3f523edb146c3dfbc52e7631b37e6f326e0e980d (diff) | |
| parent | f77ac3d657e9b1d40012153e872a2118cca10a3d (diff) | |
| download | u-boot-imx-58bbc77eb0a01033803264539d2c76c242cba210.zip u-boot-imx-58bbc77eb0a01033803264539d2c76c242cba210.tar.gz u-boot-imx-58bbc77eb0a01033803264539d2c76c242cba210.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'lib_avr32')
| -rw-r--r-- | lib_avr32/board.c | 2 | ||||
| -rw-r--r-- | lib_avr32/interrupts.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib_avr32/board.c b/lib_avr32/board.c index 11d864f..809ee3b 100644 --- a/lib_avr32/board.c +++ b/lib_avr32/board.c @@ -311,6 +311,8 @@ void board_init_r(gd_t *new_gd, ulong dest_addr) dma_alloc_init(); board_init_info(); + enable_interrupts(); + bd->bi_flashstart = 0; bd->bi_flashsize = 0; bd->bi_flashoffset = 0; diff --git a/lib_avr32/interrupts.c b/lib_avr32/interrupts.c index ce538f3..28df20d 100644 --- a/lib_avr32/interrupts.c +++ b/lib_avr32/interrupts.c @@ -35,5 +35,5 @@ int disable_interrupts(void) sr = sysreg_read(SR); asm volatile("ssrf %0" : : "n"(SYSREG_GM_OFFSET)); - return SYSREG_BFEXT(GM, sr); + return !SYSREG_BFEXT(GM, sr); } |