diff options
| author | Peter Pearse <peter.pearse@arm.com> | 2008-01-07 15:34:22 +0000 |
|---|---|---|
| committer | Peter Pearse <peter.pearse@arm.com> | 2008-01-07 15:34:22 +0000 |
| commit | 4985ca5af3767ffe13ea96e1dc26f88c81084414 (patch) | |
| tree | 94db0464d5c7c643816dd3b4e823343496c2ed96 /lib_avr32 | |
| parent | 2ae64f5135e51bb18753884d1265b99e89b5aedd (diff) | |
| parent | 5c740711f0ea5b51414b341b71597c4a0751be74 (diff) | |
Merge with git://www.denx.de/git/u-boot.git
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 11d864feac..809ee3be92 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 ce538f3d92..28df20db01 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); } |