public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-10-31 16:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: Markos Chandras <markos.chandras@imgtec.com>
This commit is contained in:
Markos Chandras 2014-11-13 13:32:03 +00:00
parent 934c79231c
commit a7e07b1ae5
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/mips/Kconfig
View file

@ -1150,6 +1150,9 @@ config SOC_PNX8335
bool bool
select SOC_PNX833X select SOC_PNX833X
config MIPS_SPRAM
bool
config SWAP_IO_SPACE config SWAP_IO_SPACE
bool bool
@ -1821,10 +1824,12 @@ config CPU_MIPSR1
config CPU_MIPSR2 config CPU_MIPSR2
bool bool
default y if CPU_MIPS32_R2 || CPU_MIPS64_R2 || CPU_CAVIUM_OCTEON default y if CPU_MIPS32_R2 || CPU_MIPS64_R2 || CPU_CAVIUM_OCTEON
select MIPS_SPRAM
config CPU_MIPSR6 config CPU_MIPSR6
bool bool
default y if CPU_MIPS32_R6 || CPU_MIPS64_R6 default y if CPU_MIPS32_R6 || CPU_MIPS64_R6
select MIPS_SPRAM
config EVA config EVA
bool bool

4
arch/mips/include/asm/spram.h
View file

@ -1,10 +1,10 @@
#ifndef _MIPS_SPRAM_H #ifndef _MIPS_SPRAM_H
#define _MIPS_SPRAM_H #define _MIPS_SPRAM_H
#ifdef CONFIG_CPU_MIPSR2 #if defined(CONFIG_MIPS_SPRAM)
extern __init void spram_config(void); extern __init void spram_config(void);
#else #else
static inline void spram_config(void) { }; static inline void spram_config(void) { };
#endif /* CONFIG_CPU_MIPSR2 */ #endif /* CONFIG_MIPS_SPRAM */
#endif /* _MIPS_SPRAM_H */ #endif /* _MIPS_SPRAM_H */

2
arch/mips/kernel/Makefile
View file

@ -52,7 +52,7 @@ obj-$(CONFIG_MIPS_MT_SMP) += smp-mt.o
obj-$(CONFIG_MIPS_CMP) += smp-cmp.o obj-$(CONFIG_MIPS_CMP) += smp-cmp.o
obj-$(CONFIG_MIPS_CPS) += smp-cps.o cps-vec.o obj-$(CONFIG_MIPS_CPS) += smp-cps.o cps-vec.o
obj-$(CONFIG_MIPS_GIC_IPI) += smp-gic.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) += vpe.o
obj-$(CONFIG_MIPS_VPE_LOADER_CMP) += vpe-cmp.o obj-$(CONFIG_MIPS_VPE_LOADER_CMP) += vpe-cmp.o