Commit 65ce6197 authored by Lauri Kasanen's avatar Lauri Kasanen Committed by Thomas Bogendoerfer
Browse files

Revert "MIPS: Remove unused R4300 CPU support" 



This reverts commit f9065b54.

We're adding Nintendo 64 support, so the VR4300 is no longer unused.

Signed-off-by: default avatarLauri Kasanen <cand@gmx.com>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent a2fa4ced

arch/mips/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -1660,6 +1660,15 @@ config CPU_VR41XX 
	  kernel built with this option will not run on any other type of

	  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

	bool "R4x00"

	depends on SYS_HAS_CPU_R4X00
@@ -1994,6 +2003,9 @@ config SYS_HAS_CPU_TX39XX 
config SYS_HAS_CPU_VR41XX

	bool



config SYS_HAS_CPU_R4300

	bool



config SYS_HAS_CPU_R4X00

	bool

arch/mips/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ cflags-y += $(call as-option,-Wa$(comma)-mno-fix-loongson3-llsc,) 
#

cflags-$(CONFIG_CPU_R3000)	+= -march=r3000

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_R4X00)	+= -march=r4600 -Wa,--trap

cflags-$(CONFIG_CPU_TX49XX)	+= -march=r4600 -Wa,--trap

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

+5 −0
Original line number Diff line number Diff line
@@ -122,6 +122,11 @@ static inline int __pure __get_cpu_type(const int cpu_type) 
	case CPU_VR4181A:

#endif



#ifdef CONFIG_SYS_HAS_CPU_R4300

	case CPU_R4300:

	case CPU_R4310:

#endif



#ifdef CONFIG_SYS_HAS_CPU_R4X00

	case CPU_R4000PC:

	case CPU_R4000SC:

arch/mips/include/asm/cpu.h

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ enum cpu_type_enum { 
	/*

	 * R4000 class processors

	 */

	CPU_R4000PC, CPU_R4000SC, CPU_R4000MC, CPU_R4200,

	CPU_R4000PC, CPU_R4000SC, CPU_R4000MC, CPU_R4200, CPU_R4300, CPU_R4310,

	CPU_R4400PC, CPU_R4400SC, CPU_R4400MC, CPU_R4600, CPU_R4640, CPU_R4650,

	CPU_R4700, CPU_R5000, CPU_R5500, CPU_NEVADA, CPU_R10000,

	CPU_R12000, CPU_R14000, CPU_R16000, CPU_VR41XX, CPU_VR4111, CPU_VR4121,

arch/mips/include/asm/vermagic.h

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#define MODULE_PROC_FAMILY "TX39XX "

#elif defined CONFIG_CPU_VR41XX

#define MODULE_PROC_FAMILY "VR41XX "

#elif defined CONFIG_CPU_R4300

#define MODULE_PROC_FAMILY "R4300 "

#elif defined CONFIG_CPU_R4X00

#define MODULE_PROC_FAMILY "R4X00 "

#elif defined CONFIG_CPU_TX49XX