diff options
| author | Tom Rini <trini@ti.com> | 2012-12-22 05:55:19 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-12-22 05:55:19 -0700 |
| commit | da77a0e593c370c9ed79ea22c1df321d5f4e4bbf (patch) | |
| tree | d31ff68d217a80422845c82104098eef744f4cde /arch/arm/cpu/arm1136/cpu.c | |
| parent | ba6d4b64b33146740a15b3dd5a5f511a2bc8d6f6 (diff) | |
| parent | 96764df1b47ddebfb50fadf5af72530b07b5fc89 (diff) | |
| download | olio-uboot-2014.01-da77a0e593c370c9ed79ea22c1df321d5f4e4bbf.tar.xz olio-uboot-2014.01-da77a0e593c370c9ed79ea22c1df321d5f4e4bbf.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/cpu/arm1136/cpu.c')
| -rw-r--r-- | arch/arm/cpu/arm1136/cpu.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/arch/arm/cpu/arm1136/cpu.c b/arch/arm/cpu/arm1136/cpu.c index b98e3d9fa..32a4c244c 100644 --- a/arch/arm/cpu/arm1136/cpu.c +++ b/arch/arm/cpu/arm1136/cpu.c @@ -141,16 +141,6 @@ void flush_cache(unsigned long start, unsigned long size) flush_dcache_range(start, start + size); } -void enable_caches(void) -{ -#ifndef CONFIG_SYS_ICACHE_OFF - icache_enable(); -#endif -#ifndef CONFIG_SYS_DCACHE_OFF - dcache_enable(); -#endif -} - #else /* #ifndef CONFIG_SYS_DCACHE_OFF */ void invalidate_dcache_all(void) { @@ -172,3 +162,15 @@ void flush_cache(unsigned long start, unsigned long size) { } #endif /* #ifndef CONFIG_SYS_DCACHE_OFF */ + +#if !defined(CONFIG_SYS_ICACHE_OFF) || !defined(CONFIG_SYS_DCACHE_OFF) +void enable_caches(void) +{ +#ifndef CONFIG_SYS_ICACHE_OFF + icache_enable(); +#endif +#ifndef CONFIG_SYS_DCACHE_OFF + dcache_enable(); +#endif +} +#endif |