Commit a7e07b1a authored by Markos Chandras's avatar Markos Chandras
Browse files

MIPS: asm: spram: Add new symbol for MIPS scratch pad storage 

MIPS R6, just like MIPS R2, have scratch pad storage, so add a new
symbol which is selected by MIPS R2 and R6.

Link: http://www.linux-mips.org/archives/linux-mips/2015-01/msg00389.html


Cc: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
parent 934c7923

arch/mips/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -1150,6 +1150,9 @@ config SOC_PNX8335 
	bool

	select SOC_PNX833X



config MIPS_SPRAM

	bool



config SWAP_IO_SPACE

	bool
@@ -1821,10 +1824,12 @@ config CPU_MIPSR1 
config CPU_MIPSR2

	bool

	default y if CPU_MIPS32_R2 || CPU_MIPS64_R2 || CPU_CAVIUM_OCTEON

	select MIPS_SPRAM



config CPU_MIPSR6

	bool

	default y if CPU_MIPS32_R6 || CPU_MIPS64_R6

	select MIPS_SPRAM



config EVA

	bool

arch/mips/include/asm/spram.h

+2 −2
Original line number Diff line number Diff line 
#ifndef _MIPS_SPRAM_H

#define _MIPS_SPRAM_H



#ifdef CONFIG_CPU_MIPSR2

#if defined(CONFIG_MIPS_SPRAM)

extern __init void spram_config(void);

#else

static inline void spram_config(void) { };

#endif /* CONFIG_CPU_MIPSR2 */

#endif /* CONFIG_MIPS_SPRAM */



#endif /* _MIPS_SPRAM_H */

arch/mips/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ obj-$(CONFIG_MIPS_MT_SMP) += smp-mt.o 
obj-$(CONFIG_MIPS_CMP)		+= smp-cmp.o

obj-$(CONFIG_MIPS_CPS)		+= smp-cps.o cps-vec.o

obj-$(CONFIG_MIPS_GIC_IPI)	+= smp-gic.o

obj-$(CONFIG_CPU_MIPSR2)	+= spram.o

obj-$(CONFIG_MIPS_SPRAM)	+= spram.o



obj-$(CONFIG_MIPS_VPE_LOADER)	+= vpe.o

obj-$(CONFIG_MIPS_VPE_LOADER_CMP) += vpe-cmp.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE