Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 542c1020 authored by Shinya Kuribayashi's avatar Shinya Kuribayashi Committed by Ralf Baechle
Browse files

MIPS: Add CONFIG_CPU_R5500 for NEC VR5500 series processors 



We already have sufficient infrastructure to support VR5500 and VR5500A
series processors.  Here's a Makefile support to make it selectable by
ports, and enable it for NEC EMMA2RH Markeins board.

This patch also fixes a confused target help, and adds 1Gb PageMask bits
supported by VR5500 and its variants.

Signed-off-by: default avatarShinya Kuribayashi <shinya.kuribayashi@necel.com>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent bc4c4e83

arch/mips/Kconfig

+15 −3
Original line number Original line Diff line number Diff line
@@ -249,10 +249,9 @@ config MARKEINS 
	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_HAS_CPU_R5000

	select SYS_HAS_CPU_R5500

	help

	help

	  This enables support for the R5432-based NEC Mark-eins

	  This enables support for the NEC Mark-eins board with VR5500 CPU.

	  boards with R5500 CPU.





config MACH_VR41XX

config MACH_VR41XX

	bool "NEC VR4100 series based machines"

	bool "NEC VR4100 series based machines"
@@ -1123,6 +1122,16 @@ config CPU_R5432 
	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_64BIT_KERNEL

	select CPU_SUPPORTS_64BIT_KERNEL





config CPU_R5500

	bool "R5500"

	depends on SYS_HAS_CPU_R5500

	select CPU_HAS_LLSC

	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_64BIT_KERNEL

	help

	  NEC VR5500 and VR5500A series processors implement 64-bit MIPS IV

	  instruction set.



config CPU_R6000

config CPU_R6000

	bool "R6000"

	bool "R6000"

	depends on EXPERIMENTAL

	depends on EXPERIMENTAL
@@ -1233,6 +1242,9 @@ config SYS_HAS_CPU_R5000 
config SYS_HAS_CPU_R5432

config SYS_HAS_CPU_R5432

	bool

	bool





config SYS_HAS_CPU_R5500

	bool



config SYS_HAS_CPU_R6000

config SYS_HAS_CPU_R6000

	bool

	bool

arch/mips/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -131,6 +131,8 @@ cflags-$(CONFIG_CPU_MIPS64_R2) += $(call cc-option,-march=mips64r2,-mips64r2 -U_ 
cflags-$(CONFIG_CPU_R5000)	+= -march=r5000 -Wa,--trap

cflags-$(CONFIG_CPU_R5000)	+= -march=r5000 -Wa,--trap

cflags-$(CONFIG_CPU_R5432)	+= $(call cc-option,-march=r5400,-march=r5000) \

cflags-$(CONFIG_CPU_R5432)	+= $(call cc-option,-march=r5400,-march=r5000) \

			-Wa,--trap

			-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) \

cflags-$(CONFIG_CPU_NEVADA)	+= $(call cc-option,-march=rm5200,-march=r5000) \

			-Wa,--trap

			-Wa,--trap

cflags-$(CONFIG_CPU_RM7000)	+= $(call cc-option,-march=rm7000,-march=r5000) \

cflags-$(CONFIG_CPU_RM7000)	+= $(call cc-option,-march=rm7000,-march=r5000) \

arch/mips/include/asm/mipsregs.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -192,6 +192,7 @@ 
#define PM_16M		0x01ffe000

#define PM_16M		0x01ffe000

#define PM_64M		0x07ffe000

#define PM_64M		0x07ffe000

#define PM_256M		0x1fffe000

#define PM_256M		0x1fffe000

#define PM_1G		0x7fffe000





#endif

#endif

arch/mips/include/asm/module.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -98,6 +98,8 @@ search_module_dbetables(unsigned long addr) 
#define MODULE_PROC_FAMILY "R5000 "

#define MODULE_PROC_FAMILY "R5000 "

#elif defined CONFIG_CPU_R5432

#elif defined CONFIG_CPU_R5432

#define MODULE_PROC_FAMILY "R5432 "

#define MODULE_PROC_FAMILY "R5432 "

#elif defined CONFIG_CPU_R5500

#define MODULE_PROC_FAMILY "R5500 "

#elif defined CONFIG_CPU_R6000

#elif defined CONFIG_CPU_R6000

#define MODULE_PROC_FAMILY "R6000 "

#define MODULE_PROC_FAMILY "R6000 "

#elif defined CONFIG_CPU_NEVADA

#elif defined CONFIG_CPU_NEVADA

arch/mips/kernel/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ obj-$(CONFIG_CPU_R4X00) += r4k_fpu.o r4k_switch.o 
obj-$(CONFIG_CPU_R5000)		+= r4k_fpu.o r4k_switch.o

obj-$(CONFIG_CPU_R5000)		+= r4k_fpu.o r4k_switch.o

obj-$(CONFIG_CPU_R6000)		+= r6000_fpu.o r4k_switch.o

obj-$(CONFIG_CPU_R6000)		+= r6000_fpu.o r4k_switch.o

obj-$(CONFIG_CPU_R5432)		+= r4k_fpu.o r4k_switch.o

obj-$(CONFIG_CPU_R5432)		+= r4k_fpu.o r4k_switch.o

obj-$(CONFIG_CPU_R5500)		+= r4k_fpu.o r4k_switch.o

obj-$(CONFIG_CPU_R8000)		+= r4k_fpu.o r4k_switch.o

obj-$(CONFIG_CPU_R8000)		+= r4k_fpu.o r4k_switch.o

obj-$(CONFIG_CPU_RM7000)	+= r4k_fpu.o r4k_switch.o

obj-$(CONFIG_CPU_RM7000)	+= r4k_fpu.o r4k_switch.o

obj-$(CONFIG_CPU_RM9000)	+= r4k_fpu.o r4k_switch.o

obj-$(CONFIG_CPU_RM9000)	+= r4k_fpu.o r4k_switch.o