diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
| commit | 6dc6472581f693b5fc95aebedf67b4960fb85cf0 (patch) | |
| tree | 06a5a9a08519950575505273eabced331ed51405 /arch/blackfin/include/asm/cplb.h | |
| parent | ee673eaa72d8d185012b1027a05e25aba18c267f (diff) | |
| parent | 8acd3a60bcca17c6d89c73cee3ad6057eb83ba1e (diff) | |
Merge commit 'origin'
Manual fixup of conflicts on:
arch/powerpc/include/asm/dcr-regs.h
drivers/net/ibm_newemac/core.h
Diffstat (limited to 'arch/blackfin/include/asm/cplb.h')
| -rw-r--r-- | arch/blackfin/include/asm/cplb.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/blackfin/include/asm/cplb.h b/arch/blackfin/include/asm/cplb.h index 05d6f05fb748..9e8b4035fcec 100644 --- a/arch/blackfin/include/asm/cplb.h +++ b/arch/blackfin/include/asm/cplb.h | |||
| @@ -55,7 +55,13 @@ | |||
| 55 | #endif | 55 | #endif |
| 56 | 56 | ||
| 57 | #define L1_DMEMORY (CPLB_LOCK | CPLB_COMMON) | 57 | #define L1_DMEMORY (CPLB_LOCK | CPLB_COMMON) |
| 58 | #define L2_MEMORY (CPLB_COMMON) | 58 | #ifdef CONFIG_BFIN_L2_CACHEABLE |
| 59 | #define L2_IMEMORY (SDRAM_IGENERIC) | ||
| 60 | #define L2_DMEMORY (SDRAM_DGENERIC) | ||
| 61 | #else | ||
| 62 | #define L2_IMEMORY (CPLB_COMMON) | ||
| 63 | #define L2_DMEMORY (CPLB_COMMON) | ||
| 64 | #endif | ||
| 59 | #define SDRAM_DNON_CHBL (CPLB_COMMON) | 65 | #define SDRAM_DNON_CHBL (CPLB_COMMON) |
| 60 | #define SDRAM_EBIU (CPLB_COMMON) | 66 | #define SDRAM_EBIU (CPLB_COMMON) |
| 61 | #define SDRAM_OOPS (CPLB_VALID | ANOMALY_05000158_WORKAROUND | CPLB_LOCK | CPLB_DIRTY) | 67 | #define SDRAM_OOPS (CPLB_VALID | ANOMALY_05000158_WORKAROUND | CPLB_LOCK | CPLB_DIRTY) |