Pull button into test branch

[linux-drm-fsl-dcu.git] / arch / powerpc / platforms / cell / Makefile

diff --git a/arch/powerpc/platforms/cell/Makefile b/arch/powerpc/platforms/cell/Makefile
index 3b998a393e3f762d2b2cc4ccca54f9355519330f..f90e8337796cbe3b35046db8c145579f5e398e14 100644 (file)
--- a/arch/powerpc/platforms/cell/Makefile
+++ b/arch/powerpc/platforms/cell/Makefile
@@ -1,10 +1,20 @@
-obj-y                  += interrupt.o iommu.o setup.o spider-pic.o
-obj-y                  += pervasive.o
+obj-$(CONFIG_PPC_CELL_NATIVE)          += interrupt.o iommu.o setup.o \
+                                          cbe_regs.o spider-pic.o \
+                                          pervasive.o pmu.o io-workarounds.o
+obj-$(CONFIG_CBE_RAS)                  += ras.o
 
-obj-$(CONFIG_SMP)      += smp.o
-obj-$(CONFIG_SPU_FS)   += spu-base.o spufs/
+obj-$(CONFIG_CBE_THERM)                        += cbe_thermal.o
+obj-$(CONFIG_CBE_CPUFREQ)              += cbe_cpufreq.o
 
-spu-base-y             += spu_base.o spu_priv1.o
+ifeq ($(CONFIG_SMP),y)
+obj-$(CONFIG_PPC_CELL_NATIVE)          += smp.o
+endif
 
-builtin-spufs-$(CONFIG_SPU_FS) += spu_syscalls.o
-obj-y                  += $(builtin-spufs-m)
+# needed only when building loadable spufs.ko
+spufs-modular-$(CONFIG_SPU_FS)         += spu_syscalls.o
+spu-priv1-$(CONFIG_PPC_CELL_NATIVE)    += spu_priv1_mmio.o
+
+obj-$(CONFIG_SPU_BASE)                 += spu_callbacks.o spu_base.o \
+                                          spu_coredump.o \
+                                          $(spufs-modular-m) \
+                                          $(spu-priv1-y) spufs/