On 10/16/2013 07:14 PM, Steven J. Hill wrote:
From: Deng-Cheng Zhu <dengcheng.zhu@xxxxxxxxxx> This patch adds VPE loader support for platforms having a CMP. Signed-off-by: Deng-Cheng Zhu <dengcheng.zhu@xxxxxxxxxx> Signed-off-by: Steven J. Hill <Steven.Hill@xxxxxxxxxx> Reviewed-by: Qais Yousef <Qais.Yousef@xxxxxxxxxx> --- arch/mips/kernel/Makefile | 2 +- arch/mips/kernel/vpe-cmp.c | 184 ++++++++++++++++++++++++++++++++++++++++++++ arch/mips/kernel/vpe-mt.c | 4 + 3 files changed, 189 insertions(+), 1 deletion(-) create mode 100644 arch/mips/kernel/vpe-cmp.c diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile index 51f9117..912eb64 100644 --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile @@ -54,7 +54,7 @@ obj-$(CONFIG_MIPS_MT_SMP) += smp-mt.o obj-$(CONFIG_MIPS_CMP) += smp-cmp.o obj-$(CONFIG_CPU_MIPSR2) += spram.o -obj-$(CONFIG_MIPS_VPE_LOADER) += vpe.o vpe-mt.o +obj-$(CONFIG_MIPS_VPE_LOADER) += vpe.o vpe-cmp.o vpe-mt.o obj-$(CONFIG_MIPS_VPE_APSP_API) += rtlx.o obj-$(CONFIG_I8259) += i8259.o diff --git a/arch/mips/kernel/vpe-cmp.c b/arch/mips/kernel/vpe-cmp.c new file mode 100644 index 0000000..a5628ca --- /dev/null +++ b/arch/mips/kernel/vpe-cmp.c @@ -0,0 +1,184 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. + * + * Copyright (C) 2004, 2005 MIPS Technologies, Inc. All rights reserved. + * Copyright (C) 2013 Imagination Technologies Ltd. + */ +#ifdef CONFIG_MIPS_CMP +
Get rid of all these #ifdef. Use Kconfig symbols in the makefile instead.