aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/include
diff options
context:
space:
mode:
authorPaul Burton <paul.burton@imgtec.com>2017-06-05 14:21:27 -0400
committerRalf Baechle <ralf@linux-mips.org>2017-08-29 09:21:51 -0400
commit3b2db173f01229410129f438d2f261c16a360eef (patch)
tree080f38e2506a8ff4a32a71b16ceaa3e135a10a72 /arch/mips/include
parent114c370845111d4f2e31f9c6d4eedd9e4fc01f86 (diff)
MIPS: Remove unused R6000 support
The kernel contains a small amount of incomplete code aimed at supporting old R6000 CPUs. This is: - Unused, as no machine selects CONFIG_SYS_HAS_CPU_R6000. - Broken, since there are glaring errors such as r6000_fpu.S moving the FCSR register to t1, then ignoring it & instead saving t0 into struct sigcontext... - A maintenance headache, since it's code that nobody can test which nevertheless imposes constraints on code which it shares with other machines. Remove this incomplete & broken R6000 CPU support in order to clean up and in preparation for changes which will no longer need to consider dragging the pretense of R6000 support along with them. Signed-off-by: Paul Burton <paul.burton@imgtec.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/16236/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/include')
-rw-r--r--arch/mips/include/asm/cpu-type.h5
-rw-r--r--arch/mips/include/asm/cpu.h5
-rw-r--r--arch/mips/include/asm/module.h2
3 files changed, 0 insertions, 12 deletions
diff --git a/arch/mips/include/asm/cpu-type.h b/arch/mips/include/asm/cpu-type.h
index 175fe565f4e1..a45af3de075d 100644
--- a/arch/mips/include/asm/cpu-type.h
+++ b/arch/mips/include/asm/cpu-type.h
@@ -151,11 +151,6 @@ static inline int __pure __get_cpu_type(const int cpu_type)
151 case CPU_R5500: 151 case CPU_R5500:
152#endif 152#endif
153 153
154#ifdef CONFIG_SYS_HAS_CPU_R6000
155 case CPU_R6000:
156 case CPU_R6000A:
157#endif
158
159#ifdef CONFIG_SYS_HAS_CPU_NEVADA 154#ifdef CONFIG_SYS_HAS_CPU_NEVADA
160 case CPU_NEVADA: 155 case CPU_NEVADA:
161#endif 156#endif
diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h
index d0c152b989f8..ece9b84f3bcb 100644
--- a/arch/mips/include/asm/cpu.h
+++ b/arch/mips/include/asm/cpu.h
@@ -286,11 +286,6 @@ enum cpu_type_enum {
286 CPU_R3081, CPU_R3081E, 286 CPU_R3081, CPU_R3081E,
287 287
288 /* 288 /*
289 * R6000 class processors
290 */
291 CPU_R6000, CPU_R6000A,
292
293 /*
294 * R4000 class processors 289 * R4000 class processors
295 */ 290 */
296 CPU_R4000PC, CPU_R4000SC, CPU_R4000MC, CPU_R4200, CPU_R4300, CPU_R4310, 291 CPU_R4000PC, CPU_R4000SC, CPU_R4000MC, CPU_R4200, CPU_R4300, CPU_R4310,
diff --git a/arch/mips/include/asm/module.h b/arch/mips/include/asm/module.h
index e51add184717..06552a965cf4 100644
--- a/arch/mips/include/asm/module.h
+++ b/arch/mips/include/asm/module.h
@@ -114,8 +114,6 @@ search_module_dbetables(unsigned long addr)
114#define MODULE_PROC_FAMILY "R5432 " 114#define MODULE_PROC_FAMILY "R5432 "
115#elif defined CONFIG_CPU_R5500 115#elif defined CONFIG_CPU_R5500
116#define MODULE_PROC_FAMILY "R5500 " 116#define MODULE_PROC_FAMILY "R5500 "
117#elif defined CONFIG_CPU_R6000
118#define MODULE_PROC_FAMILY "R6000 "
119#elif defined CONFIG_CPU_NEVADA 117#elif defined CONFIG_CPU_NEVADA
120#define MODULE_PROC_FAMILY "NEVADA " 118#define MODULE_PROC_FAMILY "NEVADA "
121#elif defined CONFIG_CPU_R8000 119#elif defined CONFIG_CPU_R8000