diff options
author | Shinya Kuribayashi <skuribay@ruby.dti.ne.jp> | 2008-10-23 12:27:57 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2008-10-27 12:18:29 -0400 |
commit | 542c1020ac1cbc2f50934086ad893384a2cbd233 (patch) | |
tree | 1216d52d4a4c7422094057ff06c66e61ce04a37a | |
parent | bc4c4e832a203f66959e5eb2ecc56b0b9525173e (diff) |
MIPS: Add CONFIG_CPU_R5500 for NEC VR5500 series processors
We already have sufficient infrastructure to support VR5500 and VR5500A
series processors. Here's a Makefile support to make it selectable by
ports, and enable it for NEC EMMA2RH Markeins board.
This patch also fixes a confused target help, and adds 1Gb PageMask bits
supported by VR5500 and its variants.
Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/Kconfig | 18 | ||||
-rw-r--r-- | arch/mips/Makefile | 2 | ||||
-rw-r--r-- | arch/mips/include/asm/mipsregs.h | 1 | ||||
-rw-r--r-- | arch/mips/include/asm/module.h | 2 | ||||
-rw-r--r-- | arch/mips/kernel/Makefile | 1 | ||||
-rw-r--r-- | arch/mips/lib/Makefile | 1 | ||||
-rw-r--r-- | arch/mips/lib/dump_tlb.c | 1 | ||||
-rw-r--r-- | arch/mips/mm/Makefile | 1 |
8 files changed, 24 insertions, 3 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 3a83f2a1b240..16fc6155285a 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -249,10 +249,9 @@ config MARKEINS | |||
249 | select SYS_SUPPORTS_32BIT_KERNEL | 249 | select SYS_SUPPORTS_32BIT_KERNEL |
250 | select SYS_SUPPORTS_BIG_ENDIAN | 250 | select SYS_SUPPORTS_BIG_ENDIAN |
251 | select SYS_SUPPORTS_LITTLE_ENDIAN | 251 | select SYS_SUPPORTS_LITTLE_ENDIAN |
252 | select SYS_HAS_CPU_R5000 | 252 | select SYS_HAS_CPU_R5500 |
253 | help | 253 | help |
254 | This enables support for the R5432-based NEC Mark-eins | 254 | This enables support for the NEC Mark-eins board with VR5500 CPU. |
255 | boards with R5500 CPU. | ||
256 | 255 | ||
257 | config MACH_VR41XX | 256 | config MACH_VR41XX |
258 | bool "NEC VR4100 series based machines" | 257 | bool "NEC VR4100 series based machines" |
@@ -1123,6 +1122,16 @@ config CPU_R5432 | |||
1123 | select CPU_SUPPORTS_32BIT_KERNEL | 1122 | select CPU_SUPPORTS_32BIT_KERNEL |
1124 | select CPU_SUPPORTS_64BIT_KERNEL | 1123 | select CPU_SUPPORTS_64BIT_KERNEL |
1125 | 1124 | ||
1125 | config CPU_R5500 | ||
1126 | bool "R5500" | ||
1127 | depends on SYS_HAS_CPU_R5500 | ||
1128 | select CPU_HAS_LLSC | ||
1129 | select CPU_SUPPORTS_32BIT_KERNEL | ||
1130 | select CPU_SUPPORTS_64BIT_KERNEL | ||
1131 | help | ||
1132 | NEC VR5500 and VR5500A series processors implement 64-bit MIPS IV | ||
1133 | instruction set. | ||
1134 | |||
1126 | config CPU_R6000 | 1135 | config CPU_R6000 |
1127 | bool "R6000" | 1136 | bool "R6000" |
1128 | depends on EXPERIMENTAL | 1137 | depends on EXPERIMENTAL |
@@ -1233,6 +1242,9 @@ config SYS_HAS_CPU_R5000 | |||
1233 | config SYS_HAS_CPU_R5432 | 1242 | config SYS_HAS_CPU_R5432 |
1234 | bool | 1243 | bool |
1235 | 1244 | ||
1245 | config SYS_HAS_CPU_R5500 | ||
1246 | bool | ||
1247 | |||
1236 | config SYS_HAS_CPU_R6000 | 1248 | config SYS_HAS_CPU_R6000 |
1237 | bool | 1249 | bool |
1238 | 1250 | ||
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 8abac786c1f5..a21b12ce903d 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile | |||
@@ -131,6 +131,8 @@ cflags-$(CONFIG_CPU_MIPS64_R2) += $(call cc-option,-march=mips64r2,-mips64r2 -U_ | |||
131 | cflags-$(CONFIG_CPU_R5000) += -march=r5000 -Wa,--trap | 131 | cflags-$(CONFIG_CPU_R5000) += -march=r5000 -Wa,--trap |
132 | cflags-$(CONFIG_CPU_R5432) += $(call cc-option,-march=r5400,-march=r5000) \ | 132 | cflags-$(CONFIG_CPU_R5432) += $(call cc-option,-march=r5400,-march=r5000) \ |
133 | -Wa,--trap | 133 | -Wa,--trap |
134 | cflags-$(CONFIG_CPU_R5500) += $(call cc-option,-march=r5500,-march=r5000) \ | ||
135 | -Wa,--trap | ||
134 | cflags-$(CONFIG_CPU_NEVADA) += $(call cc-option,-march=rm5200,-march=r5000) \ | 136 | cflags-$(CONFIG_CPU_NEVADA) += $(call cc-option,-march=rm5200,-march=r5000) \ |
135 | -Wa,--trap | 137 | -Wa,--trap |
136 | cflags-$(CONFIG_CPU_RM7000) += $(call cc-option,-march=rm7000,-march=r5000) \ | 138 | cflags-$(CONFIG_CPU_RM7000) += $(call cc-option,-march=rm7000,-march=r5000) \ |
diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h index 979866000da4..9316324d070d 100644 --- a/arch/mips/include/asm/mipsregs.h +++ b/arch/mips/include/asm/mipsregs.h | |||
@@ -192,6 +192,7 @@ | |||
192 | #define PM_16M 0x01ffe000 | 192 | #define PM_16M 0x01ffe000 |
193 | #define PM_64M 0x07ffe000 | 193 | #define PM_64M 0x07ffe000 |
194 | #define PM_256M 0x1fffe000 | 194 | #define PM_256M 0x1fffe000 |
195 | #define PM_1G 0x7fffe000 | ||
195 | 196 | ||
196 | #endif | 197 | #endif |
197 | 198 | ||
diff --git a/arch/mips/include/asm/module.h b/arch/mips/include/asm/module.h index de6d09ebbd80..e2e09b2cd265 100644 --- a/arch/mips/include/asm/module.h +++ b/arch/mips/include/asm/module.h | |||
@@ -98,6 +98,8 @@ search_module_dbetables(unsigned long addr) | |||
98 | #define MODULE_PROC_FAMILY "R5000 " | 98 | #define MODULE_PROC_FAMILY "R5000 " |
99 | #elif defined CONFIG_CPU_R5432 | 99 | #elif defined CONFIG_CPU_R5432 |
100 | #define MODULE_PROC_FAMILY "R5432 " | 100 | #define MODULE_PROC_FAMILY "R5432 " |
101 | #elif defined CONFIG_CPU_R5500 | ||
102 | #define MODULE_PROC_FAMILY "R5500 " | ||
101 | #elif defined CONFIG_CPU_R6000 | 103 | #elif defined CONFIG_CPU_R6000 |
102 | #define MODULE_PROC_FAMILY "R6000 " | 104 | #define MODULE_PROC_FAMILY "R6000 " |
103 | #elif defined CONFIG_CPU_NEVADA | 105 | #elif defined CONFIG_CPU_NEVADA |
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile index d9da7112aaf8..b1372c27f136 100644 --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile | |||
@@ -33,6 +33,7 @@ obj-$(CONFIG_CPU_R4X00) += r4k_fpu.o r4k_switch.o | |||
33 | obj-$(CONFIG_CPU_R5000) += r4k_fpu.o r4k_switch.o | 33 | obj-$(CONFIG_CPU_R5000) += r4k_fpu.o r4k_switch.o |
34 | obj-$(CONFIG_CPU_R6000) += r6000_fpu.o r4k_switch.o | 34 | obj-$(CONFIG_CPU_R6000) += r6000_fpu.o r4k_switch.o |
35 | obj-$(CONFIG_CPU_R5432) += r4k_fpu.o r4k_switch.o | 35 | obj-$(CONFIG_CPU_R5432) += r4k_fpu.o r4k_switch.o |
36 | obj-$(CONFIG_CPU_R5500) += r4k_fpu.o r4k_switch.o | ||
36 | obj-$(CONFIG_CPU_R8000) += r4k_fpu.o r4k_switch.o | 37 | obj-$(CONFIG_CPU_R8000) += r4k_fpu.o r4k_switch.o |
37 | obj-$(CONFIG_CPU_RM7000) += r4k_fpu.o r4k_switch.o | 38 | obj-$(CONFIG_CPU_RM7000) += r4k_fpu.o r4k_switch.o |
38 | obj-$(CONFIG_CPU_RM9000) += r4k_fpu.o r4k_switch.o | 39 | obj-$(CONFIG_CPU_RM9000) += r4k_fpu.o r4k_switch.o |
diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile index 8810dfb915dd..dbcf6511b74e 100644 --- a/arch/mips/lib/Makefile +++ b/arch/mips/lib/Makefile | |||
@@ -18,6 +18,7 @@ obj-$(CONFIG_CPU_R4300) += dump_tlb.o | |||
18 | obj-$(CONFIG_CPU_R4X00) += dump_tlb.o | 18 | obj-$(CONFIG_CPU_R4X00) += dump_tlb.o |
19 | obj-$(CONFIG_CPU_R5000) += dump_tlb.o | 19 | obj-$(CONFIG_CPU_R5000) += dump_tlb.o |
20 | obj-$(CONFIG_CPU_R5432) += dump_tlb.o | 20 | obj-$(CONFIG_CPU_R5432) += dump_tlb.o |
21 | obj-$(CONFIG_CPU_R5500) += dump_tlb.o | ||
21 | obj-$(CONFIG_CPU_R6000) += | 22 | obj-$(CONFIG_CPU_R6000) += |
22 | obj-$(CONFIG_CPU_R8000) += | 23 | obj-$(CONFIG_CPU_R8000) += |
23 | obj-$(CONFIG_CPU_RM7000) += dump_tlb.o | 24 | obj-$(CONFIG_CPU_RM7000) += dump_tlb.o |
diff --git a/arch/mips/lib/dump_tlb.c b/arch/mips/lib/dump_tlb.c index 465ff0ec85b9..779821cd54ab 100644 --- a/arch/mips/lib/dump_tlb.c +++ b/arch/mips/lib/dump_tlb.c | |||
@@ -25,6 +25,7 @@ static inline const char *msk2str(unsigned int mask) | |||
25 | case PM_16M: return "16Mb"; | 25 | case PM_16M: return "16Mb"; |
26 | case PM_64M: return "64Mb"; | 26 | case PM_64M: return "64Mb"; |
27 | case PM_256M: return "256Mb"; | 27 | case PM_256M: return "256Mb"; |
28 | case PM_1G: return "1Gb"; | ||
28 | #endif | 29 | #endif |
29 | } | 30 | } |
30 | return ""; | 31 | return ""; |
diff --git a/arch/mips/mm/Makefile b/arch/mips/mm/Makefile index 44e8dd8106bf..95ba32b5b720 100644 --- a/arch/mips/mm/Makefile +++ b/arch/mips/mm/Makefile | |||
@@ -19,6 +19,7 @@ obj-$(CONFIG_CPU_R4300) += c-r4k.o cex-gen.o tlb-r4k.o | |||
19 | obj-$(CONFIG_CPU_R4X00) += c-r4k.o cex-gen.o tlb-r4k.o | 19 | obj-$(CONFIG_CPU_R4X00) += c-r4k.o cex-gen.o tlb-r4k.o |
20 | obj-$(CONFIG_CPU_R5000) += c-r4k.o cex-gen.o tlb-r4k.o | 20 | obj-$(CONFIG_CPU_R5000) += c-r4k.o cex-gen.o tlb-r4k.o |
21 | obj-$(CONFIG_CPU_R5432) += c-r4k.o cex-gen.o tlb-r4k.o | 21 | obj-$(CONFIG_CPU_R5432) += c-r4k.o cex-gen.o tlb-r4k.o |
22 | obj-$(CONFIG_CPU_R5500) += c-r4k.o cex-gen.o tlb-r4k.o | ||
22 | obj-$(CONFIG_CPU_R8000) += c-r4k.o cex-gen.o tlb-r8k.o | 23 | obj-$(CONFIG_CPU_R8000) += c-r4k.o cex-gen.o tlb-r8k.o |
23 | obj-$(CONFIG_CPU_RM7000) += c-r4k.o cex-gen.o tlb-r4k.o | 24 | obj-$(CONFIG_CPU_RM7000) += c-r4k.o cex-gen.o tlb-r4k.o |
24 | obj-$(CONFIG_CPU_RM9000) += c-r4k.o cex-gen.o tlb-r4k.o | 25 | obj-$(CONFIG_CPU_RM9000) += c-r4k.o cex-gen.o tlb-r4k.o |