On Fri, 16 Jan 2015, Markos Chandras wrote:
> MIPS R6, just like MIPS R2, can use the spram_config() function
> in spram.c
>
> Signed-off-by: Markos Chandras <markos.chandras@xxxxxxxxxx>
> ---
> arch/mips/include/asm/spram.h | 4 ++--
> arch/mips/kernel/Makefile | 1 +
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/arch/mips/include/asm/spram.h b/arch/mips/include/asm/spram.h
> index 0b89006e4907..e02a1961c542 100644
> --- a/arch/mips/include/asm/spram.h
> +++ b/arch/mips/include/asm/spram.h
> @@ -1,10 +1,10 @@
> #ifndef _MIPS_SPRAM_H
> #define _MIPS_SPRAM_H
>
> -#ifdef CONFIG_CPU_MIPSR2
> +#if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6)
> extern __init void spram_config(void);
> #else
> static inline void spram_config(void) { };
> -#endif /* CONFIG_CPU_MIPSR2 */
> +#endif /* CONFIG_CPU_MIPSR2 || CONFIG_CPU_MIPSR6 */
>
> #endif /* _MIPS_SPRAM_H */
> diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
> index 92987d1bbe5f..0862ae781339 100644
> --- a/arch/mips/kernel/Makefile
> +++ b/arch/mips/kernel/Makefile
> @@ -53,6 +53,7 @@ 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_CPU_MIPSR6) += spram.o
>
> obj-$(CONFIG_MIPS_VPE_LOADER) += vpe.o
> obj-$(CONFIG_MIPS_VPE_LOADER_CMP) += vpe-cmp.o
It looks to me like this should be a separate CONFIG_MIPS_SPRAM option
selected by CPU_MIPSR2 and CPU_MIPSR6. This will avoid the need to list
`spram.o' twice which may be asking for troubles. Also this will keep
simple the `#ifdef' condition above.
Maciej
