diff options
author | Franck Bui-Huu <fbuihuu@gmail.com> | 2007-06-04 11:46:31 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-07-10 12:32:57 -0400 |
commit | 09bb9ce15f6e0daba70b7e6978f233ffe2d356eb (patch) | |
tree | d2b69fa3c61744da997251eb4a2a1ccab9bdc4e0 /include/asm-mips/mach-ip27 | |
parent | 69ed25b895b01216b392b60ad3b99d1274e1afa8 (diff) |
[MIPS] Allow generic spaces.h to be included by platform specific ones
Before this patch, when a platform needed to customize one constant in
spaces.h, they need to redefine all of them.
Now they can just redefine one constant and include the generic file
header at the end:
#include <asm/mach-generic/spaces.h>
This patch doesn't allow to redefine CAC_BASE, IO_BASE and UNCAC_BASE
for 32 bits platforms because there's no need to do so.
This will avoid some macro duplications. It's important specially if
we'll add complex macros.
Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
delete mode 100644 include/asm-mips/mach-ip32/spaces.h
Diffstat (limited to 'include/asm-mips/mach-ip27')
-rw-r--r-- | include/asm-mips/mach-ip27/spaces.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/asm-mips/mach-ip27/spaces.h b/include/asm-mips/mach-ip27/spaces.h index 45e61785ef42..b18802a0b17e 100644 --- a/include/asm-mips/mach-ip27/spaces.h +++ b/include/asm-mips/mach-ip27/spaces.h | |||
@@ -14,22 +14,17 @@ | |||
14 | * IP27 uses the R10000's uncached attribute feature. Attribute 3 selects | 14 | * IP27 uses the R10000's uncached attribute feature. Attribute 3 selects |
15 | * uncached memory addressing. | 15 | * uncached memory addressing. |
16 | */ | 16 | */ |
17 | #define CAC_BASE 0xa800000000000000 | ||
18 | 17 | ||
19 | #define HSPEC_BASE 0x9000000000000000 | 18 | #define HSPEC_BASE 0x9000000000000000 |
20 | #define IO_BASE 0x9200000000000000 | 19 | #define IO_BASE 0x9200000000000000 |
21 | #define MSPEC_BASE 0x9400000000000000 | 20 | #define MSPEC_BASE 0x9400000000000000 |
22 | #define UNCAC_BASE 0x9600000000000000 | 21 | #define UNCAC_BASE 0x9600000000000000 |
23 | #define MAP_BASE 0xc000000000000000 | ||
24 | 22 | ||
25 | #define TO_PHYS(x) ( ((x) & TO_PHYS_MASK)) | ||
26 | #define TO_CAC(x) (CAC_BASE | ((x) & TO_PHYS_MASK)) | ||
27 | #define TO_UNCAC(x) (UNCAC_BASE | ((x) & TO_PHYS_MASK)) | ||
28 | #define TO_MSPEC(x) (MSPEC_BASE | ((x) & TO_PHYS_MASK)) | 23 | #define TO_MSPEC(x) (MSPEC_BASE | ((x) & TO_PHYS_MASK)) |
29 | #define TO_HSPEC(x) (HSPEC_BASE | ((x) & TO_PHYS_MASK)) | 24 | #define TO_HSPEC(x) (HSPEC_BASE | ((x) & TO_PHYS_MASK)) |
30 | 25 | ||
31 | #define PAGE_OFFSET CAC_BASE | ||
32 | |||
33 | #define HIGHMEM_START (~0UL) | 26 | #define HIGHMEM_START (~0UL) |
34 | 27 | ||
28 | #include <asm/mach-generic/spaces.h> | ||
29 | |||
35 | #endif /* _ASM_MACH_IP27_SPACES_H */ | 30 | #endif /* _ASM_MACH_IP27_SPACES_H */ |