commit 938e14e4c313eb6431d61cf10d2cdaa6c3f60168
author Kumar Gala <galak@kernel.crashing.org> Tue Jan 08 01:22:21 2008 -0600
committer Andrew Fleming-AFLEMING <afleming@freescale.com> Wed Jan 09 16:25:04 2008 -0600
tree 4346cd75759fe027b7d6871e54965871efd80f94
parent 2533e451ed8b83b2e7e235d86a6e5dd796a2475f

85xx: Remove cache config from configs.h

Either use the standard defines in asm/cache.h or grab the information
at runtime from the L1CFG SPR.

Also, minor cleanup in cache.h to make the code a bit more readable.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

include/asm-ppc/cache.h

diff --git a/include/asm-ppc/cache.h b/include/asm-ppc/cache.h
index e29bfc2..9d9b971 100644
--- a/include/asm-ppc/cache.h
+++ b/include/asm-ppc/cache.h
@@ -8,15 +8,13 @@
 #include <asm/processor.h>
 
 /* bytes per L1 cache line */
-#if !(defined(CONFIG_8xx) || defined(CONFIG_IOP480))
-#if defined(CONFIG_PPC64BRIDGE)
+#if defined(CONFIG_8xx) || defined(CONFIG_IOP480)
+#define	L1_CACHE_SHIFT	4
+#elif defined(CONFIG_PPC64BRIDGE)
 #define L1_CACHE_SHIFT	7
 #else
 #define	L1_CACHE_SHIFT	5
-#endif /* PPC64 */
-#else
-#define	L1_CACHE_SHIFT	4
-#endif /* !(8xx || IOP480) */
+#endif
 
 #define L1_CACHE_BYTES          (1 << L1_CACHE_SHIFT)