---

yaml --- r: 218714 b: refs/heads/master c: 518d4bb h: refs/heads/master v: v3
git-mirror · Oct 27, 2010 · 859092f · 859092f
1 parent 81c209b
commit 859092f
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93c10d3d68c469c1addacbc541da5518f1de021d
+refs/heads/master: 518d4bb7464dd3c04aeb23874dc360b54058c01e
diff --git a/trunk/arch/mn10300/mm/Kconfig.cache b/trunk/arch/mn10300/mm/Kconfig.cache
@@ -33,3 +33,23 @@ endchoice
 
 config MN10300_CACHE_ENABLED
 	def_bool y if !MN10300_CACHE_DISABLED
+
+
+choice
+	prompt "CPU cache flush/invalidate method"
+	default MN10300_CACHE_MANAGE_BY_TAG
+	depends on MN10300_CACHE_ENABLED
+	help
+	  This determines the method by which CPU cache flushing and
+	  invalidation is performed.
+
+config MN10300_CACHE_MANAGE_BY_TAG
+	bool "Use the cache tag registers directly"
+
+endchoice
+
+config MN10300_CACHE_INV_BY_TAG
+	def_bool y if MN10300_CACHE_MANAGE_BY_TAG && MN10300_CACHE_ENABLED
+
+config MN10300_CACHE_FLUSH_BY_TAG
+	def_bool y if MN10300_CACHE_MANAGE_BY_TAG && MN10300_CACHE_WBACK
diff --git a/trunk/arch/mn10300/mm/Makefile b/trunk/arch/mn10300/mm/Makefile
@@ -2,8 +2,9 @@
 # Makefile for the MN10300-specific memory management code
 #
 
-cacheflush-y	:= cache.o cache-mn10300.o
-cacheflush-$(CONFIG_MN10300_CACHE_WBACK) += cache-flush-mn10300.o
+cacheflush-y	:= cache.o
+cacheflush-$(CONFIG_MN10300_CACHE_INV_BY_TAG) += cache-inv-by-tag.o
+cacheflush-$(CONFIG_MN10300_CACHE_FLUSH_BY_TAG) += cache-flush-by-tag.o
 
 cacheflush-$(CONFIG_MN10300_CACHE_DISABLED) := cache-disabled.o
 

diff --git a/trunk/arch/mn10300/mm/cache-flush-mn10300.S → trunk/arch/mn10300/mm/cache-flush-by-tag.S b/trunk/arch/mn10300/mm/cache-flush-mn10300.S → trunk/arch/mn10300/mm/cache-flush-by-tag.S
diff --git a/trunk/arch/mn10300/mm/cache-mn10300.S → trunk/arch/mn10300/mm/cache-inv-by-tag.S b/trunk/arch/mn10300/mm/cache-mn10300.S → trunk/arch/mn10300/mm/cache-inv-by-tag.S