1 files changed, 5 insertions, 5 deletions
diff --git a/arch/sh/kernel/head_64.S b/arch/sh/kernel/head_64.S
index c969db592bef..d3479287b10a 100644
--- a/arch/sh/kernel/head_64.S
+++ b/arch/sh/kernel/head_64.S
@@ -63,23 +63,23 @@
 #define MMUDR_CACHED_L  0x000000000000015a | ALIGNED_PHYSICAL
                        /* 512 Mb, Cacheable, Write-back, read/write, Not User, Ph. Add. */
-#ifdef CONFIG_ICACHE_DISABLED
+#ifdef CONFIG_CACHE_OFF
 #define ICCR0_INIT_VAL  ICCR0_OFF                       /* ICACHE off */
 #else
 #define ICCR0_INIT_VAL  ICCR0_ON | ICCR0_ICI            /* ICE + ICI */
 #endif
 #define ICCR1_INIT_VAL  ICCR1_NOLOCK                    /* No locking */
-#if defined (CONFIG_DCACHE_DISABLED)
+#if defined (CONFIG_CACHE_OFF)
 #define OCCR0_INIT_VAL  OCCR0_OFF                          /* D-cache: off  */
-#elif defined (CONFIG_DCACHE_WRITE_THROUGH)
+#elif defined (CONFIG_CACHE_WRITETHROUGH)
 #define OCCR0_INIT_VAL  OCCR0_ON | OCCR0_OCI | OCCR0_WT    /* D-cache: on,   */
                                                           /* WT, invalidate */
-#elif defined (CONFIG_DCACHE_WRITE_BACK)
+#elif defined (CONFIG_CACHE_WRITEBACK)
 #define OCCR0_INIT_VAL  OCCR0_ON | OCCR0_OCI | OCCR0_WB    /* D-cache: on,   */
                                                           /* WB, invalidate */
 #else
-#error preprocessor flag CONFIG_DCACHE_... not recognized!
+#error preprocessor flag CONFIG_CACHE_... not recognized!
 #endif
 #define OCCR1_INIT_VAL  OCCR1_NOLOCK                       /* No locking     */

diff --git a/arch/sh/kernel/head_64.S b/arch/sh/kernel/head_64.S index c969db592bef..d3479287b10a 100644 --- a/arch/sh/kernel/head_64.S +++ b/arch/sh/kernel/head_64.S
@@ -63,23 +63,23 @@
63	#define MMUDR_CACHED_L 0x000000000000015a \| ALIGNED_PHYSICAL	63	#define MMUDR_CACHED_L 0x000000000000015a \| ALIGNED_PHYSICAL
64	/* 512 Mb, Cacheable, Write-back, read/write, Not User, Ph. Add. */	64	/* 512 Mb, Cacheable, Write-back, read/write, Not User, Ph. Add. */
65		65
66	#ifdef CONFIG_ICACHE_DISABLED	66	#ifdef CONFIG_CACHE_OFF
67	#define ICCR0_INIT_VAL ICCR0_OFF /* ICACHE off */	67	#define ICCR0_INIT_VAL ICCR0_OFF /* ICACHE off */
68	#else	68	#else
69	#define ICCR0_INIT_VAL ICCR0_ON \| ICCR0_ICI /* ICE + ICI */	69	#define ICCR0_INIT_VAL ICCR0_ON \| ICCR0_ICI /* ICE + ICI */
70	#endif	70	#endif
71	#define ICCR1_INIT_VAL ICCR1_NOLOCK /* No locking */	71	#define ICCR1_INIT_VAL ICCR1_NOLOCK /* No locking */
72		72
73	#if defined (CONFIG_DCACHE_DISABLED)	73	#if defined (CONFIG_CACHE_OFF)
74	#define OCCR0_INIT_VAL OCCR0_OFF /* D-cache: off */	74	#define OCCR0_INIT_VAL OCCR0_OFF /* D-cache: off */
75	#elif defined (CONFIG_DCACHE_WRITE_THROUGH)	75	#elif defined (CONFIG_CACHE_WRITETHROUGH)
76	#define OCCR0_INIT_VAL OCCR0_ON \| OCCR0_OCI \| OCCR0_WT /* D-cache: on, */	76	#define OCCR0_INIT_VAL OCCR0_ON \| OCCR0_OCI \| OCCR0_WT /* D-cache: on, */
77	/* WT, invalidate */	77	/* WT, invalidate */
78	#elif defined (CONFIG_DCACHE_WRITE_BACK)	78	#elif defined (CONFIG_CACHE_WRITEBACK)
79	#define OCCR0_INIT_VAL OCCR0_ON \| OCCR0_OCI \| OCCR0_WB /* D-cache: on, */	79	#define OCCR0_INIT_VAL OCCR0_ON \| OCCR0_OCI \| OCCR0_WB /* D-cache: on, */
80	/* WB, invalidate */	80	/* WB, invalidate */
81	#else	81	#else
82	#error preprocessor flag CONFIG_DCACHE_... not recognized!	82	#error preprocessor flag CONFIG_CACHE_... not recognized!
83	#endif	83	#endif
84		84
85	#define OCCR1_INIT_VAL OCCR1_NOLOCK /* No locking */	85	#define OCCR1_INIT_VAL OCCR1_NOLOCK /* No locking */