MIPS: Remove unused R5432 CPU support

Our R5432 CPU support can only be included if a system selects
CONFIG_SYS_HAS_CPU_R5432. No system does, making all R5432-related CPU
support dead code. Remove it.

Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: linux-mips@vger.kernel.org

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index ce8d5e4640a1464ef9f36ff1cbbc82e9ec1dae2a..9a2eabd516963bc330ec924dfac0b110949bf893 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1631,14 +1631,6 @@ config CPU_R5000
        help
          MIPS Technologies R5000-series processors other than the Nevada.
 
-config CPU_R5432
-       bool "R5432"
-       depends on SYS_HAS_CPU_R5432
-       select CPU_SUPPORTS_32BIT_KERNEL
-       select CPU_SUPPORTS_64BIT_KERNEL
-       select CPU_SUPPORTS_HUGEPAGES
-       select CPU_HAS_LOAD_STORE_LR
-
 config CPU_R5500
        bool "R5500"
        depends on SYS_HAS_CPU_R5500
@@ -1971,9 +1963,6 @@ config SYS_HAS_CPU_TX49XX
 config SYS_HAS_CPU_R5000
        bool
 
-config SYS_HAS_CPU_R5432
-       bool
-
 config SYS_HAS_CPU_R5500
        bool
 

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index e728d0555466b3b37a4d8cc2b44254dabf5b49dd..e507e5b6e606f6450bf70158879149316fa8036d 100644 (file)
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -173,8 +173,6 @@ cflags-$(CONFIG_CPU_MIPS64_R1)      += -march=mips64 -Wa,--trap
 cflags-$(CONFIG_CPU_MIPS64_R2) += -march=mips64r2 -Wa,--trap
 cflags-$(CONFIG_CPU_MIPS64_R6) += -march=mips64r6 -Wa,--trap
 cflags-$(CONFIG_CPU_R5000)     += -march=r5000 -Wa,--trap
-cflags-$(CONFIG_CPU_R5432)     += $(call cc-option,-march=r5400,-march=r5000) \
-                       -Wa,--trap
 cflags-$(CONFIG_CPU_R5500)     += $(call cc-option,-march=r5500,-march=r5000) \
                        -Wa,--trap
 cflags-$(CONFIG_CPU_NEVADA)    += $(call cc-option,-march=rm5200,-march=r5000) \

diff --git a/arch/mips/include/asm/cpu-type.h b/arch/mips/include/asm/cpu-type.h
index a6c4114e3aa7cba98fb237cd42019572c115e27f..b080f822219c22584cbc9076c5fdd9520fce0b62 100644 (file)
--- a/arch/mips/include/asm/cpu-type.h
+++ b/arch/mips/include/asm/cpu-type.h
@@ -138,10 +138,6 @@ static inline int __pure __get_cpu_type(const int cpu_type)
        case CPU_R5000:
 #endif
 
-#ifdef CONFIG_SYS_HAS_CPU_R5432
-       case CPU_R5432:
-#endif
-
 #ifdef CONFIG_SYS_HAS_CPU_R5500
        case CPU_R5500:
 #endif

diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h
index babc602862bd93a90941664735620c8322c035ea..dcc0cc8c67735740d82491d7c2d150735f411856 100644 (file)
--- a/arch/mips/include/asm/cpu.h
+++ b/arch/mips/include/asm/cpu.h
@@ -295,7 +295,7 @@ enum cpu_type_enum {
         */
        CPU_R4000PC, CPU_R4000SC, CPU_R4000MC, CPU_R4200,
        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_R10000,
        CPU_R12000, CPU_R14000, CPU_R16000, CPU_VR41XX, CPU_VR4111, CPU_VR4121,
        CPU_VR4122, CPU_VR4131, CPU_VR4133, CPU_VR4181, CPU_VR4181A, CPU_RM7000,
        CPU_SR71000, CPU_TX49XX,

diff --git a/arch/mips/include/asm/module.h b/arch/mips/include/asm/module.h
index eaf3f37ed583004cff885786f47c6ae264a019e7..92cb94ef0231c38b9452fe989d8096674a953137 100644 (file)
--- a/arch/mips/include/asm/module.h
+++ b/arch/mips/include/asm/module.h
@@ -109,8 +109,6 @@ search_module_dbetables(unsigned long addr)
 #define MODULE_PROC_FAMILY "TX49XX "
 #elif defined CONFIG_CPU_R5000
 #define MODULE_PROC_FAMILY "R5000 "
-#elif defined CONFIG_CPU_R5432
-#define MODULE_PROC_FAMILY "R5432 "
 #elif defined CONFIG_CPU_R5500
 #define MODULE_PROC_FAMILY "R5500 "
 #elif defined CONFIG_CPU_NEVADA

diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 7e6b693bff0ab7eb5ff265a5922f31419c6a31ac..2000faa057a38c0b5c64c925c62f6a728f4b352f 100644 (file)
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -1459,14 +1459,6 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
                             MIPS_CPU_LLSC;
                c->tlbsize = 48;
                break;
-       case PRID_IMP_R5432:
-               c->cputype = CPU_R5432;
-               __cpu_name[cpu] = "R5432";
-               set_isa(c, MIPS_CPU_ISA_IV);
-               c->options = R4K_OPTS | MIPS_CPU_FPU | MIPS_CPU_32FPR |
-                            MIPS_CPU_WATCH | MIPS_CPU_LLSC;
-               c->tlbsize = 48;
-               break;
        case PRID_IMP_R5500:
                c->cputype = CPU_R5500;
                __cpu_name[cpu] = "R5500";

diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index 07d9aa4f7491f1c84946ad54d3b4cc91e94a987d..89b9c851d82270bf8fea9f17941abab04258db2c 100644 (file)
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -1098,7 +1098,6 @@ static void probe_pcache(void)
                c->options |= MIPS_CPU_CACHE_CDEX_P;
                break;
 
-       case CPU_R5432:
        case CPU_R5500:
                icache_size = 1 << (12 + ((config & CONF_IC) >> 9));
                c->icache.linesz = 16 << ((config & CONF_IB) >> 5);

diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 35471a2a3528584e93d2d619587a542839b10b02..81e2605ddf4474044a84a5b0d2346661fbf1da51 100644 (file)
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -603,7 +603,6 @@ void build_tlb_write_entry(u32 **p, struct uasm_label **l,
 
        case CPU_VR4131:
        case CPU_VR4133:
-       case CPU_R5432:
                uasm_i_nop(p);
                uasm_i_nop(p);
                tlbw(p);