From 3c8798983403cb68a827d7a0d09b1134524a1b7d Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 6 Oct 2008 03:39:07 -0400 Subject: Blackfin: only initialize the RTC when actually used Signed-off-by: Mike Frysinger --- lib_blackfin/board.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'lib_blackfin') diff --git a/lib_blackfin/board.c b/lib_blackfin/board.c index ba573928b..2679b438f 100644 --- a/lib_blackfin/board.c +++ b/lib_blackfin/board.c @@ -250,7 +250,6 @@ void init_cplbtables(void) extern int exception_init(void); extern int irq_init(void); -extern int rtc_init(void); extern int timer_init(void); void board_init_f(ulong bootflag) @@ -313,9 +312,6 @@ void board_init_f(ulong bootflag) display_banner(); checkboard(); -#if defined(CONFIG_RTC_BFIN) && defined(CONFIG_CMD_DATE) - rtc_init(); -#endif timer_init(); printf("Clock: VCO: %lu MHz, Core: %lu MHz, System: %lu MHz\n", -- cgit v1.2.3 From 50f0d211912a648e31aa9123b4665a0444bb8ca9 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 7 Aug 2008 15:21:47 -0400 Subject: Blackfin: unify cache handling code Signed-off-by: Mike Frysinger --- cpu/blackfin/cpu.c | 35 ----------------------------------- lib_blackfin/cache.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 35 deletions(-) (limited to 'lib_blackfin') diff --git a/cpu/blackfin/cpu.c b/cpu/blackfin/cpu.c index 0c799325c..9efd88e7e 100644 --- a/cpu/blackfin/cpu.c +++ b/cpu/blackfin/cpu.c @@ -14,46 +14,11 @@ #include #include #include -#include #include #include "cpu.h" #include "serial.h" -void icache_enable(void) -{ - bfin_write_IMEM_CONTROL(bfin_read_IMEM_CONTROL() | (IMC | ENICPLB)); - SSYNC(); -} - -void icache_disable(void) -{ - bfin_write_IMEM_CONTROL(bfin_read_IMEM_CONTROL() & ~(IMC | ENICPLB)); - SSYNC(); -} - -int icache_status(void) -{ - return bfin_read_IMEM_CONTROL() & ENICPLB; -} - -void dcache_enable(void) -{ - bfin_write_DMEM_CONTROL(bfin_read_DMEM_CONTROL() | (ACACHE_BCACHE | ENDCPLB | PORT_PREF0)); - SSYNC(); -} - -void dcache_disable(void) -{ - bfin_write_DMEM_CONTROL(bfin_read_DMEM_CONTROL() & ~(ACACHE_BCACHE | ENDCPLB | PORT_PREF0)); - SSYNC(); -} - -int dcache_status(void) -{ - return bfin_read_DMEM_CONTROL() & ENDCPLB; -} - __attribute__ ((__noreturn__)) void cpu_init_f(ulong bootflag, ulong loaded_from_ldr) { diff --git a/lib_blackfin/cache.c b/lib_blackfin/cache.c index c2f6e2848..41e2a62d1 100644 --- a/lib_blackfin/cache.c +++ b/lib_blackfin/cache.c @@ -11,6 +11,7 @@ #include #include +#include void flush_cache(unsigned long addr, unsigned long size) { @@ -24,3 +25,37 @@ void flush_cache(unsigned long addr, unsigned long size) if (dcache_status()) blackfin_dcache_flush_range((void *)addr, (void *)(addr + size)); } + +void icache_enable(void) +{ + bfin_write_IMEM_CONTROL(IMC | ENICPLB); + SSYNC(); +} + +void icache_disable(void) +{ + bfin_write_IMEM_CONTROL(0); + SSYNC(); +} + +int icache_status(void) +{ + return bfin_read_IMEM_CONTROL() & ENICPLB; +} + +void dcache_enable(void) +{ + bfin_write_DMEM_CONTROL(ACACHE_BCACHE | ENDCPLB | PORT_PREF0); + SSYNC(); +} + +void dcache_disable(void) +{ + bfin_write_DMEM_CONTROL(0); + SSYNC(); +} + +int dcache_status(void) +{ + return bfin_read_DMEM_CONTROL() & ENDCPLB; +} -- cgit v1.2.3 From 0f9a8819416ba40a53de50af148847a0e508f84d Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 7 Aug 2008 18:40:13 -0400 Subject: Blackfin: check cache bits, not cplb bits Signed-off-by: Mike Frysinger --- lib_blackfin/cache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib_blackfin') diff --git a/lib_blackfin/cache.c b/lib_blackfin/cache.c index 41e2a62d1..870c5bfba 100644 --- a/lib_blackfin/cache.c +++ b/lib_blackfin/cache.c @@ -40,7 +40,7 @@ void icache_disable(void) int icache_status(void) { - return bfin_read_IMEM_CONTROL() & ENICPLB; + return bfin_read_IMEM_CONTROL() & IMC; } void dcache_enable(void) @@ -57,5 +57,5 @@ void dcache_disable(void) int dcache_status(void) { - return bfin_read_DMEM_CONTROL() & ENDCPLB; + return bfin_read_DMEM_CONTROL() & ACACHE_BCACHE; } -- cgit v1.2.3 From 39782727e185860faa4884c2b04e84cb33d1c6cf Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 6 Oct 2008 03:55:25 -0400 Subject: Blackfin: init NAND before relocating env If booting out of NAND, we need to make sure we initialize it properly before attempting to relocate the environment. Signed-off-by: Mike Frysinger --- lib_blackfin/board.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib_blackfin') diff --git a/lib_blackfin/board.c b/lib_blackfin/board.c index 2679b438f..e184fd2f2 100644 --- a/lib_blackfin/board.c +++ b/lib_blackfin/board.c @@ -380,6 +380,11 @@ void board_init_r(gd_t * id, ulong dest_addr) spi_init_r(); #endif +#ifdef CONFIG_CMD_NAND + puts("NAND: "); + nand_init(); /* go init the NAND */ +#endif + /* relocate environment function pointers etc. */ env_relocate(); @@ -427,11 +432,6 @@ void board_init_r(gd_t * id, ulong dest_addr) copy_filename(BootFile, s, sizeof(BootFile)); #endif -#ifdef CONFIG_CMD_NAND - puts("NAND: "); - nand_init(); /* go init the NAND */ -#endif - #if defined(CONFIG_MISC_INIT_R) /* miscellaneous platform dependent initialisations */ misc_init_r(); -- cgit v1.2.3