diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2007-11-21 08:04:12 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-01-28 05:18:52 +0100 |
| commit | c96bcf958c1d79d8e8aa58722273ec7b1ffb815c (patch) | |
| tree | 3908bcd549a9b5012cecb0e6f85cbaf2f3094aaf /arch/sh/kernel/head_64.S | |
| parent | sh: Fix up generic BUG build for SH-5. (diff) | |
| download | linux-c96bcf958c1d79d8e8aa58722273ec7b1ffb815c.tar.xz linux-c96bcf958c1d79d8e8aa58722273ec7b1ffb815c.zip | |
sh: Use existing CONFIG_CACHE_xx options in head_64.S.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/head_64.S')
| -rw-r--r-- | arch/sh/kernel/head_64.S | 10 |
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 */ |