|
@@ -6,7 +6,7 @@
|
|
|
#include <linux/types.h>
|
|
|
#include <common.h>
|
|
|
|
|
|
-#ifndef CONFIG_SYS_DCACHE_OFF
|
|
|
+#if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF)
|
|
|
void invalidate_dcache_all(void)
|
|
|
{
|
|
|
asm volatile("mcr p15, 0, %0, c7, c6, 0\n" : : "r"(0));
|
|
@@ -46,7 +46,7 @@ void flush_dcache_range(unsigned long start, unsigned long stop)
|
|
|
|
|
|
asm volatile("mcr p15, 0, %0, c7, c10, 4\n" : : "r"(0));
|
|
|
}
|
|
|
-#else /* #ifndef CONFIG_SYS_DCACHE_OFF */
|
|
|
+#else /* #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) */
|
|
|
void invalidate_dcache_all(void)
|
|
|
{
|
|
|
}
|
|
@@ -54,7 +54,7 @@ void invalidate_dcache_all(void)
|
|
|
void flush_dcache_all(void)
|
|
|
{
|
|
|
}
|
|
|
-#endif /* #ifndef CONFIG_SYS_DCACHE_OFF */
|
|
|
+#endif /* #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) */
|
|
|
|
|
|
/*
|
|
|
* Stub implementations for l2 cache operations
|
|
@@ -66,7 +66,7 @@ __weak void l2_cache_disable(void) {}
|
|
|
__weak void invalidate_l2_cache(void) {}
|
|
|
#endif
|
|
|
|
|
|
-#ifndef CONFIG_SYS_ICACHE_OFF
|
|
|
+#if !CONFIG_IS_ENABLED(SYS_ICACHE_OFF)
|
|
|
/* Invalidate entire I-cache and branch predictor array */
|
|
|
void invalidate_icache_all(void)
|
|
|
{
|
|
@@ -80,10 +80,10 @@ void invalidate_icache_all(void) {}
|
|
|
|
|
|
void enable_caches(void)
|
|
|
{
|
|
|
-#ifndef CONFIG_SYS_ICACHE_OFF
|
|
|
+#if !CONFIG_IS_ENABLED(SYS_ICACHE_OFF)
|
|
|
icache_enable();
|
|
|
#endif
|
|
|
-#ifndef CONFIG_SYS_DCACHE_OFF
|
|
|
+#if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF)
|
|
|
dcache_enable();
|
|
|
#endif
|
|
|
}
|