diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-01-10 00:49:59 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-01-10 00:49:59 +0100 |
| commit | 694976afa5dcc5c4e7eaeaa0612eac35cd5bd8ec (patch) | |
| tree | 711b1a20a1bab99fc304b6fa55374daf35f4919c /include/asm-ppc/cache.h | |
| parent | 80adb2761627ec10eb8997bea6c1e52e34816c6b (diff) | |
| parent | 17a41e4492121ccf9fa2c10c2cb1a6d1c18d74f7 (diff) | |
| download | u-boot-imx-694976afa5dcc5c4e7eaeaa0612eac35cd5bd8ec.zip u-boot-imx-694976afa5dcc5c4e7eaeaa0612eac35cd5bd8ec.tar.gz u-boot-imx-694976afa5dcc5c4e7eaeaa0612eac35cd5bd8ec.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
Diffstat (limited to 'include/asm-ppc/cache.h')
| -rw-r--r-- | include/asm-ppc/cache.h | 10 |
1 files changed, 4 insertions, 6 deletions
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) |