summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuinn Jensen <quinn.jensen@freescale.com>2007-10-24 21:27:11 -0600
committerQuinn Jensen <quinn.jensen@freescale.com>2007-10-24 21:27:11 -0600
commit30b79f6f01481dd8c5491ef3165521fc2ad68f8c (patch)
tree7d86c57ec448b2a6440c382252913861211d850f
parentc75985a7796a43a75f002f310f13b23730757b4f (diff)
CR ENGR00053192 MXC Sahara2: Use CONFIG_OUTER_CACHE
Patch for CR ENGR00053192 MXC Sahara2: Use CONFIG_OUTER_CACHE Fix Sahara unit test failure by replacing CONFIG_CPU_CACHE_L2X0 with CONFIG_OUTER_CACHE. Applies to linux 2.6.22 kernel on MX27 platforms. http://www.bitshrine.org/gpp/linux-2.6.22-mx-CR-ENGR00053192-MXC-Sahara2-Use-CONFIG_OUT.patch
-rw-r--r--drivers/mxc/security/sahara2/sah_memory_mapper.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mxc/security/sahara2/sah_memory_mapper.c b/drivers/mxc/security/sahara2/sah_memory_mapper.c
index 1e9af9263853..594d85ef41a2 100644
--- a/drivers/mxc/security/sahara2/sah_memory_mapper.c
+++ b/drivers/mxc/security/sahara2/sah_memory_mapper.c
@@ -1182,7 +1182,7 @@ sah_Link *sah_Make_Links(sah_Link * ptr, sah_Link ** tail)
/* Now we can walk through the list of pages in the buffer */
if (status == FSL_RETURN_OK_S) {
-#if defined(FLUSH_SPECIFIC_DATA_ONLY) && !defined(CONFIG_CPU_CACHE_L210)
+#if defined(FLUSH_SPECIFIC_DATA_ONLY) && !defined(CONFIG_OUTER_CACHE)
/*
* Now that pages are wired, clear user data from cache lines. When
* there is just an L1 cache, clean based on user virtual for ARM.
@@ -1264,7 +1264,7 @@ sah_Link *sah_Make_Links(sah_Link * ptr, sah_Link ** tail)
sah_Link_Get_Data(ptr) &
~PAGE_MASK);
}
-#if defined(FLUSH_SPECIFIC_DATA_ONLY) && defined(CONFIG_CPU_CACHE_L210)
+#if defined(FLUSH_SPECIFIC_DATA_ONLY) && defined(CONFIG_OUTER_CACHE)
/*
* When there is an L2 cache, clean based on kernel
* virtual..
@@ -1280,7 +1280,7 @@ sah_Link *sah_Make_Links(sah_Link * ptr, sah_Link ** tail)
/* Fill in link information */
link->len = buffer_length;
-#if !defined(CONFIG_CPU_CACHE_L210)
+#if !defined(CONFIG_OUTER_CACHE)
/* use original virtual */
link->original_data = ptr->data;
#else
@@ -1320,7 +1320,7 @@ sah_Link *sah_Make_Links(sah_Link * ptr, sah_Link ** tail)
buffer_length -= prev_link->len;
buffer_start += prev_link->len;
-#if !defined(CONFIG_CPU_CACHE_L210)
+#if !defined(CONFIG_OUTER_CACHE)
/* use original virtual */
link->original_data = ptr->data;
#else