Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / arch / arm / lib / cache.c

diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c
index 92b61a26531a6d922eb40a2e24e437b6f8b36681..8b1c8ed4bfcc92e5f5ac62970adf9c4676a44aa7 100644 (file)
--- a/arch/arm/lib/cache.c
+++ b/arch/arm/lib/cache.c
@@ -27,7 +27,7 @@
 
 void  __flush_cache(unsigned long start, unsigned long size)
 {
-#if defined(CONFIG_OMAP2420) || defined(CONFIG_ARM1136)
+#if defined(CONFIG_ARM1136)
        void arm1136_cache_flush(void);
 
        arm1136_cache_flush();
@@ -53,3 +53,15 @@ void __flush_dcache_all(void)
 }
 void   flush_dcache_all(void)
        __attribute__((weak, alias("__flush_dcache_all")));
+
+
+/*
+ * Default implementation of enable_caches()
+ * Real implementation should be in platform code
+ */
+void __enable_caches(void)
+{
+       puts("WARNING: Caches not enabled\n");
+}
+void enable_caches(void)
+       __attribute__((weak, alias("__enable_caches")));