Commit f9065b54 authored by Paul Burton's avatar Paul Burton

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: default avatarPaul Burton <paul.burton@mips.com>
Cc: linux-mips@vger.kernel.org
parent f23478f6
...@@ -1601,15 +1601,6 @@ config CPU_VR41XX ...@@ -1601,15 +1601,6 @@ config CPU_VR41XX
kernel built with this option will not run on any other type of kernel built with this option will not run on any other type of
processor or vice versa. processor or vice versa.
config CPU_R4300
bool "R4300"
depends on SYS_HAS_CPU_R4300
select CPU_SUPPORTS_32BIT_KERNEL
select CPU_SUPPORTS_64BIT_KERNEL
select CPU_HAS_LOAD_STORE_LR
help
MIPS Technologies R4300-series processors.
config CPU_R4X00 config CPU_R4X00
bool "R4x00" bool "R4x00"
depends on SYS_HAS_CPU_R4X00 depends on SYS_HAS_CPU_R4X00
...@@ -1971,9 +1962,6 @@ config SYS_HAS_CPU_TX39XX ...@@ -1971,9 +1962,6 @@ config SYS_HAS_CPU_TX39XX
config SYS_HAS_CPU_VR41XX config SYS_HAS_CPU_VR41XX
bool bool
config SYS_HAS_CPU_R4300
bool
config SYS_HAS_CPU_R4X00 config SYS_HAS_CPU_R4X00
bool bool
......
...@@ -163,7 +163,6 @@ cflags-y += -fno-stack-check ...@@ -163,7 +163,6 @@ cflags-y += -fno-stack-check
# #
cflags-$(CONFIG_CPU_R3000) += -march=r3000 cflags-$(CONFIG_CPU_R3000) += -march=r3000
cflags-$(CONFIG_CPU_TX39XX) += -march=r3900 cflags-$(CONFIG_CPU_TX39XX) += -march=r3900
cflags-$(CONFIG_CPU_R4300) += -march=r4300 -Wa,--trap
cflags-$(CONFIG_CPU_VR41XX) += -march=r4100 -Wa,--trap cflags-$(CONFIG_CPU_VR41XX) += -march=r4100 -Wa,--trap
cflags-$(CONFIG_CPU_R4X00) += -march=r4600 -Wa,--trap cflags-$(CONFIG_CPU_R4X00) += -march=r4600 -Wa,--trap
cflags-$(CONFIG_CPU_TX49XX) += -march=r4600 -Wa,--trap cflags-$(CONFIG_CPU_TX49XX) += -march=r4600 -Wa,--trap
......
...@@ -116,11 +116,6 @@ static inline int __pure __get_cpu_type(const int cpu_type) ...@@ -116,11 +116,6 @@ static inline int __pure __get_cpu_type(const int cpu_type)
case CPU_VR4181A: case CPU_VR4181A:
#endif #endif
#ifdef CONFIG_SYS_HAS_CPU_R4300
case CPU_R4300:
case CPU_R4310:
#endif
#ifdef CONFIG_SYS_HAS_CPU_R4X00 #ifdef CONFIG_SYS_HAS_CPU_R4X00
case CPU_R4000PC: case CPU_R4000PC:
case CPU_R4000SC: case CPU_R4000SC:
......
...@@ -293,7 +293,7 @@ enum cpu_type_enum { ...@@ -293,7 +293,7 @@ enum cpu_type_enum {
/* /*
* R4000 class processors * R4000 class processors
*/ */
CPU_R4000PC, CPU_R4000SC, CPU_R4000MC, CPU_R4200, CPU_R4300, CPU_R4310, CPU_R4000PC, CPU_R4000SC, CPU_R4000MC, CPU_R4200,
CPU_R4400PC, CPU_R4400SC, CPU_R4400MC, CPU_R4600, CPU_R4640, CPU_R4650, CPU_R4400PC, CPU_R4400SC, CPU_R4400MC, CPU_R4600, CPU_R4640, CPU_R4650,
CPU_R4700, CPU_R5000, CPU_R5500, CPU_NEVADA, CPU_R5432, CPU_R10000, CPU_R4700, CPU_R5000, CPU_R5500, CPU_NEVADA, CPU_R5432, CPU_R10000,
CPU_R12000, CPU_R14000, CPU_R16000, CPU_VR41XX, CPU_VR4111, CPU_VR4121, CPU_R12000, CPU_R14000, CPU_R16000, CPU_VR41XX, CPU_VR4111, CPU_VR4121,
......
...@@ -103,8 +103,6 @@ search_module_dbetables(unsigned long addr) ...@@ -103,8 +103,6 @@ search_module_dbetables(unsigned long addr)
#define MODULE_PROC_FAMILY "TX39XX " #define MODULE_PROC_FAMILY "TX39XX "
#elif defined CONFIG_CPU_VR41XX #elif defined CONFIG_CPU_VR41XX
#define MODULE_PROC_FAMILY "VR41XX " #define MODULE_PROC_FAMILY "VR41XX "
#elif defined CONFIG_CPU_R4300
#define MODULE_PROC_FAMILY "R4300 "
#elif defined CONFIG_CPU_R4X00 #elif defined CONFIG_CPU_R4X00
#define MODULE_PROC_FAMILY "R4X00 " #define MODULE_PROC_FAMILY "R4X00 "
#elif defined CONFIG_CPU_TX49XX #elif defined CONFIG_CPU_TX49XX
......
...@@ -1384,15 +1384,6 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu) ...@@ -1384,15 +1384,6 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
break; break;
} }
break; break;
case PRID_IMP_R4300:
c->cputype = CPU_R4300;
__cpu_name[cpu] = "R4300";
set_isa(c, MIPS_CPU_ISA_III);
c->fpu_msk31 |= FPU_CSR_CONDX;
c->options = R4K_OPTS | MIPS_CPU_FPU | MIPS_CPU_32FPR |
MIPS_CPU_LLSC;
c->tlbsize = 32;
break;
case PRID_IMP_R4600: case PRID_IMP_R4600:
c->cputype = CPU_R4600; c->cputype = CPU_R4600;
__cpu_name[cpu] = "R4600"; __cpu_name[cpu] = "R4600";
......
...@@ -151,7 +151,6 @@ void __init check_wait(void) ...@@ -151,7 +151,6 @@ void __init check_wait(void)
cpu_wait = r39xx_wait; cpu_wait = r39xx_wait;
break; break;
case CPU_R4200: case CPU_R4200:
/* case CPU_R4300: */
case CPU_R4600: case CPU_R4600:
case CPU_R4640: case CPU_R4640:
case CPU_R4650: case CPU_R4650:
......
...@@ -1134,7 +1134,6 @@ static void probe_pcache(void) ...@@ -1134,7 +1134,6 @@ static void probe_pcache(void)
case CPU_R4400PC: case CPU_R4400PC:
case CPU_R4400SC: case CPU_R4400SC:
case CPU_R4400MC: case CPU_R4400MC:
case CPU_R4300:
icache_size = 1 << (12 + ((config & CONF_IC) >> 9)); icache_size = 1 << (12 + ((config & CONF_IC) >> 9));
c->icache.linesz = 16 << ((config & CONF_IB) >> 5); c->icache.linesz = 16 << ((config & CONF_IB) >> 5);
c->icache.ways = 1; c->icache.ways = 1;
......
...@@ -545,7 +545,6 @@ void build_tlb_write_entry(u32 **p, struct uasm_label **l, ...@@ -545,7 +545,6 @@ void build_tlb_write_entry(u32 **p, struct uasm_label **l,
tlbw(p); tlbw(p);
break; break;
case CPU_R4300:
case CPU_5KC: case CPU_5KC:
case CPU_TX49XX: case CPU_TX49XX:
case CPU_PR4450: case CPU_PR4450:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment