[PATCH] Do not build spram.o unconditionally

[PATCH] Do not build spram.o unconditionally

[Atsushi Nemoto]

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
---
Patch against linux-queue tree.

 arch/mips/kernel/Makefile    |    3 ++-
 arch/mips/kernel/cpu-probe.c |    4 ++++
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index 80c5aba..27dbbaa 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -7,7 +7,7 @@ extra-y		:= head.o init_task.o vmlinux.lds
 obj-y		+= cpu-probe.o branch.o entry.o genex.o irq.o process.o \
 		   ptrace.o reset.o semaphore.o setup.o signal.o syscall.o \
 		   time.o topology.o traps.o unaligned.o \
-		   spram.o irq-gic.o
+		   irq-gic.o
 
 obj-$(CONFIG_CEVT_BCM1480)	+= cevt-bcm1480.o
 obj-$(CONFIG_CEVT_R4K)		+= cevt-r4k.o
@@ -53,6 +53,7 @@ obj-$(CONFIG_MIPS_MT_FPAFF)	+= mips-mt-fpaff.o
 obj-$(CONFIG_MIPS_MT_SMTC)	+= smtc.o smtc-asm.o smtc-proc.o
 obj-$(CONFIG_MIPS_MT_SMP)	+= smp-mt.o
 obj-$(CONFIG_MIPS_CMP)		+= smp-cmp.o
+obj-$(CONFIG_CPU_MIPSR2)	+= spram.o
 
 obj-$(CONFIG_MIPS_APSP_KSPD)	+= kspd.o
 obj-$(CONFIG_MIPS_VPE_LOADER)	+= vpe.o
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index dd26322..335a6ae 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -676,7 +676,11 @@ static void __cpuinit decode_configs(struct cpuinfo_mips *c)
 		return;
 }
 
+#ifdef CONFIG_CPU_MIPSR2
 extern void spram_config(void);
+#else
+static inline void spram_config(void) {}
+#endif
 
 static inline void cpu_probe_mips(struct cpuinfo_mips *c)
 {

Re: [PATCH] Do not build spram.o unconditionally

[Ralf Baechle]

On Mon, Apr 14, 2008 at 10:47:59PM +0900, Atsushi Nemoto wrote:

> Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>

Also folded into the SPRAM patch.  But since not every R2 core has SPRAM
this should probably be done using a new CONFIG_ symbol.  And the
CONFIG_CPU_* were always meant for optimization not feature selection.
So I guess a little more polishing is still needed.  But it's getting
there.

Thanks!

  Ralf

Re: [PATCH] Do not build spram.o unconditionally

[Atsushi Nemoto]

On Mon, 14 Apr 2008 15:44:38 +0100, Ralf Baechle <ralf@linux-mips.org> wrote:
> Also folded into the SPRAM patch.  But since not every R2 core has SPRAM
> this should probably be done using a new CONFIG_ symbol.  And the
> CONFIG_CPU_* were always meant for optimization not feature selection.
> So I guess a little more polishing is still needed.  But it's getting
> there.

Thanks, and please do not forget fix cpu-probe.c part too.

---
Atsushi Nemoto