diff options
| author | Tom Rini <trini@ti.com> | 2013-03-04 09:44:42 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-03-04 09:44:42 -0500 |
| commit | c259188b203d95e4a854e7e29b9e4472cc982f65 (patch) | |
| tree | 5d6f8ad0cac59dffd345308cd9095789a03024a4 /arch/blackfin/cpu/cpu.c | |
| parent | 28786eb960a8def9f2bd321c488c71ce96166ae3 (diff) | |
| parent | 9faf4f08e752ca95d0986a200d48b67b59cde5ef (diff) | |
| download | olio-uboot-2014.01-c259188b203d95e4a854e7e29b9e4472cc982f65.tar.xz olio-uboot-2014.01-c259188b203d95e4a854e7e29b9e4472cc982f65.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
Diffstat (limited to 'arch/blackfin/cpu/cpu.c')
| -rw-r--r-- | arch/blackfin/cpu/cpu.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/blackfin/cpu/cpu.c b/arch/blackfin/cpu/cpu.c index 6a0bcca9f..b9fdb078b 100644 --- a/arch/blackfin/cpu/cpu.c +++ b/arch/blackfin/cpu/cpu.c @@ -68,7 +68,9 @@ void cpu_init_f(ulong bootflag, ulong loaded_from_ldr) /* Reset upon a double exception rather than just hanging. * Do not do bfin_read on SWRST as that will reset status bits. */ +# ifdef SWRST bfin_write_SWRST(DOUBLE_FAULT); +# endif #endif serial_early_puts("Board init flash\n"); @@ -92,7 +94,7 @@ int irq_init(void) #elif defined(SICA_IMASK0) bfin_write_SICA_IMASK0(0); bfin_write_SICA_IMASK1(0); -#else +#elif defined(SIC_IMASK) bfin_write_SIC_IMASK(0); #endif /* Set up a dummy NMI handler if needed. */ |