Skip to content

Commit f9065b5

Browse files
committed
MIPS: Remove unused R4300 CPU support
Our R4300 CPU support can only be included if a system selects CONFIG_SYS_HAS_CPU_R4300. No system does, making all R4300-related CPU support dead code. Remove it. Signed-off-by: Paul Burton <paul.burton@mips.com> Cc: linux-mips@vger.kernel.org
1 parent f23478f commit f9065b5

File tree

9 files changed

+1
-33
lines changed

9 files changed

+1
-33
lines changed

arch/mips/Kconfig

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1601,15 +1601,6 @@ config CPU_VR41XX
16011601
kernel built with this option will not run on any other type of
16021602
processor or vice versa.
16031603

1604-
config CPU_R4300
1605-
bool "R4300"
1606-
depends on SYS_HAS_CPU_R4300
1607-
select CPU_SUPPORTS_32BIT_KERNEL
1608-
select CPU_SUPPORTS_64BIT_KERNEL
1609-
select CPU_HAS_LOAD_STORE_LR
1610-
help
1611-
MIPS Technologies R4300-series processors.
1612-
16131604
config CPU_R4X00
16141605
bool "R4x00"
16151606
depends on SYS_HAS_CPU_R4X00
@@ -1971,9 +1962,6 @@ config SYS_HAS_CPU_TX39XX
19711962
config SYS_HAS_CPU_VR41XX
19721963
bool
19731964

1974-
config SYS_HAS_CPU_R4300
1975-
bool
1976-
19771965
config SYS_HAS_CPU_R4X00
19781966
bool
19791967

arch/mips/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ cflags-y += -fno-stack-check
163163
#
164164
cflags-$(CONFIG_CPU_R3000) += -march=r3000
165165
cflags-$(CONFIG_CPU_TX39XX) += -march=r3900
166-
cflags-$(CONFIG_CPU_R4300) += -march=r4300 -Wa,--trap
167166
cflags-$(CONFIG_CPU_VR41XX) += -march=r4100 -Wa,--trap
168167
cflags-$(CONFIG_CPU_R4X00) += -march=r4600 -Wa,--trap
169168
cflags-$(CONFIG_CPU_TX49XX) += -march=r4600 -Wa,--trap

arch/mips/include/asm/cpu-type.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,6 @@ static inline int __pure __get_cpu_type(const int cpu_type)
116116
case CPU_VR4181A:
117117
#endif
118118

119-
#ifdef CONFIG_SYS_HAS_CPU_R4300
120-
case CPU_R4300:
121-
case CPU_R4310:
122-
#endif
123-
124119
#ifdef CONFIG_SYS_HAS_CPU_R4X00
125120
case CPU_R4000PC:
126121
case CPU_R4000SC:

arch/mips/include/asm/cpu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ enum cpu_type_enum {
293293
/*
294294
* R4000 class processors
295295
*/
296-
CPU_R4000PC, CPU_R4000SC, CPU_R4000MC, CPU_R4200, CPU_R4300, CPU_R4310,
296+
CPU_R4000PC, CPU_R4000SC, CPU_R4000MC, CPU_R4200,
297297
CPU_R4400PC, CPU_R4400SC, CPU_R4400MC, CPU_R4600, CPU_R4640, CPU_R4650,
298298
CPU_R4700, CPU_R5000, CPU_R5500, CPU_NEVADA, CPU_R5432, CPU_R10000,
299299
CPU_R12000, CPU_R14000, CPU_R16000, CPU_VR41XX, CPU_VR4111, CPU_VR4121,

arch/mips/include/asm/module.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,6 @@ search_module_dbetables(unsigned long addr)
103103
#define MODULE_PROC_FAMILY "TX39XX "
104104
#elif defined CONFIG_CPU_VR41XX
105105
#define MODULE_PROC_FAMILY "VR41XX "
106-
#elif defined CONFIG_CPU_R4300
107-
#define MODULE_PROC_FAMILY "R4300 "
108106
#elif defined CONFIG_CPU_R4X00
109107
#define MODULE_PROC_FAMILY "R4X00 "
110108
#elif defined CONFIG_CPU_TX49XX

arch/mips/kernel/cpu-probe.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1384,15 +1384,6 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
13841384
break;
13851385
}
13861386
break;
1387-
case PRID_IMP_R4300:
1388-
c->cputype = CPU_R4300;
1389-
__cpu_name[cpu] = "R4300";
1390-
set_isa(c, MIPS_CPU_ISA_III);
1391-
c->fpu_msk31 |= FPU_CSR_CONDX;
1392-
c->options = R4K_OPTS | MIPS_CPU_FPU | MIPS_CPU_32FPR |
1393-
MIPS_CPU_LLSC;
1394-
c->tlbsize = 32;
1395-
break;
13961387
case PRID_IMP_R4600:
13971388
c->cputype = CPU_R4600;
13981389
__cpu_name[cpu] = "R4600";

arch/mips/kernel/idle.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ void __init check_wait(void)
151151
cpu_wait = r39xx_wait;
152152
break;
153153
case CPU_R4200:
154-
/* case CPU_R4300: */
155154
case CPU_R4600:
156155
case CPU_R4640:
157156
case CPU_R4650:

arch/mips/mm/c-r4k.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1134,7 +1134,6 @@ static void probe_pcache(void)
11341134
case CPU_R4400PC:
11351135
case CPU_R4400SC:
11361136
case CPU_R4400MC:
1137-
case CPU_R4300:
11381137
icache_size = 1 << (12 + ((config & CONF_IC) >> 9));
11391138
c->icache.linesz = 16 << ((config & CONF_IB) >> 5);
11401139
c->icache.ways = 1;

arch/mips/mm/tlbex.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,6 @@ void build_tlb_write_entry(u32 **p, struct uasm_label **l,
545545
tlbw(p);
546546
break;
547547

548-
case CPU_R4300:
549548
case CPU_5KC:
550549
case CPU_TX49XX:
551550
case CPU_PR4450:

0 commit comments

Comments
 (0)