Unverified Commit 8e96b084 authored by Paul Burton's avatar Paul Burton
Browse files

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: default avatarPaul Burton <paul.burton@mips.com>
Cc: linux-mips@vger.kernel.org
parent f9065b54

arch/mips/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -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

arch/mips/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -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) \

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

+0 −4
Original line number Diff line number Diff line
@@ -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

arch/mips/include/asm/cpu.h

+1 −1
Original line number Diff line number Diff line
@@ -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,

arch/mips/include/asm/module.h

+0 −2
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE