[Cbe-oss-dev] [patch 2/6] cell: split out platform code

[Geoff Levand]

Split the Cell BPA support into generic and platform parts.

Signed-off-by: Geoff Levand <geoffrey.levand at am.sony.com>

---

Index: cell--alp--1/arch/powerpc/Kconfig
===================================================================
--- cell--alp--1.orig/arch/powerpc/Kconfig	2006-04-26 10:15:52.000000000 -0700
+++ cell--alp--1/arch/powerpc/Kconfig	2006-04-26 11:43:11.000000000 -0700
@@ -358,15 +358,25 @@
 	  For more informations, refer to <http://www.970eval.com>

 config PPC_CELL
-	bool "  Cell Broadband Processor Architecture"
+	bool
+	default n
+
+config SPU_FS_RAWIO
+	bool
+	default n
+
+config PPC_IBM_CELL_BLADE
+	bool "  IBM Cell Blade"
 	depends on PPC_MULTIPLATFORM && PPC64
+	select PPC_CELL
 	select PPC_RTAS
 	select MMIO_NVRAM
 	select PPC_UDBG_16550
+	select SPU_FS_RAWIO

 config PPC_SYSTEMSIM
 	bool "  IBM Full System Simulator (systemsim) support"
-	depends on PPC_CELL || PPC_PSERIES || PPC_MAPLE
+	depends on PPC_IBM_CELL_BLADE || PPC_PSERIES || PPC_MAPLE
 	help
 	  Support booting resulting image under IBMs Full System Simulator.
 	  If you enable this option, you are able to select device
@@ -427,7 +437,7 @@
 	default y

 config CELL_IIC
-	depends on PPC_CELL
+	depends on PPC_IBM_CELL_BLADE
 	bool
 	default y

Index: cell--alp--1/arch/powerpc/configs/cbesim_defconfig
===================================================================
--- cell--alp--1.orig/arch/powerpc/configs/cbesim_defconfig	2006-04-26 10:15:53.000000000 -0700
+++ cell--alp--1/arch/powerpc/configs/cbesim_defconfig	2006-04-26 10:15:53.000000000 -0700
@@ -115,6 +115,8 @@
 # CONFIG_PPC_PMAC is not set
 # CONFIG_PPC_MAPLE is not set
 CONFIG_PPC_CELL=y
+CONFIG_SPU_FS_RAWIO=y
+CONFIG_PPC_IBM_CELL_BLADE=y
 CONFIG_PPC_SYSTEMSIM=y
 CONFIG_SYSTEMSIM_IDLE=y
 # CONFIG_U3_DART is not set
Index: cell--alp--1/arch/powerpc/configs/cell_defconfig
===================================================================
--- cell--alp--1.orig/arch/powerpc/configs/cell_defconfig	2006-04-26 10:15:53.000000000 -0700
+++ cell--alp--1/arch/powerpc/configs/cell_defconfig	2006-04-26 10:15:53.000000000 -0700
@@ -117,6 +117,8 @@
 # CONFIG_PPC_PMAC is not set
 # CONFIG_PPC_MAPLE is not set
 CONFIG_PPC_CELL=y
+CONFIG_SPU_FS_RAWIO=y
+CONFIG_PPC_IBM_CELL_BLADE=y
 CONFIG_PPC_SYSTEMSIM=y
 CONFIG_SYSTEMSIM_IDLE=y
 # CONFIG_U3_DART is not set
Index: cell--alp--1/arch/powerpc/configs/systemsim_defconfig
===================================================================
--- cell--alp--1.orig/arch/powerpc/configs/systemsim_defconfig	2006-04-26 10:15:52.000000000 -0700
+++ cell--alp--1/arch/powerpc/configs/systemsim_defconfig	2006-04-26 10:15:53.000000000 -0700
@@ -117,6 +117,8 @@
 # CONFIG_PPC_PMAC is not set
 CONFIG_PPC_MAPLE=y
 CONFIG_PPC_CELL=y
+CONFIG_SPU_FS_RAWIO=y
+CONFIG_PPC_IBM_CELL_BLADE=y
 CONFIG_PPC_SYSTEMSIM=y
 CONFIG_SYSTEMSIM_IDLE=y
 CONFIG_XICS=y
Index: cell--alp--1/arch/powerpc/kernel/setup_64.c
===================================================================
--- cell--alp--1.orig/arch/powerpc/kernel/setup_64.c	2006-04-26 10:15:53.000000000 -0700
+++ cell--alp--1/arch/powerpc/kernel/setup_64.c	2006-04-26 10:15:53.000000000 -0700
@@ -179,7 +179,7 @@
 #ifdef CONFIG_PPC_MAPLE
 	&maple_md,
 #endif /* CONFIG_PPC_MAPLE */
-#ifdef CONFIG_PPC_CELL
+#ifdef PPC_IBM_CELL_BLADE
 	&cell_md,
 #endif
 #ifdef CONFIG_PPC_ISERIES
Index: cell--alp--1/arch/powerpc/platforms/cell/Makefile
===================================================================
--- cell--alp--1.orig/arch/powerpc/platforms/cell/Makefile	2006-04-26 10:15:53.000000000 -0700
+++ cell--alp--1/arch/powerpc/platforms/cell/Makefile	2006-04-26 10:15:53.000000000 -0700
@@ -1,7 +1,9 @@
+ifdef CONFIG_PPC_IBM_CELL_BLADE
 obj-y			+= interrupt.o iommu.o setup.o spider-pic.o
 obj-y			+= pervasive.o pci.o
-
 obj-$(CONFIG_SMP)	+= smp.o
+endif
+
 obj-$(CONFIG_SPU_FS)	+= spufs/

 # needed only when building loadable spufs.ko
@@ -9,6 +11,8 @@
 obj-y			+= $(spufs-modular-m)

 # always needed in kernel
-spufs-builtin-$(CONFIG_SPU_FS) += spu_callbacks.o spu_base.o spu_priv1.o
+spufs-builtin-$(CONFIG_SPU_FS) += spu_callbacks.o spu_base.o
+ifdef CONFIG_SPU_FS_RAWIO
+spufs-builtin-$(CONFIG_SPU_FS) += spu_priv1.o
+endif
 obj-y			+= $(spufs-builtin-y) $(spufs-builtin-m)
-
Index: cell--alp--1/drivers/net/Kconfig
===================================================================
--- cell--alp--1.orig/drivers/net/Kconfig	2006-04-26 10:15:52.000000000 -0700
+++ cell--alp--1/drivers/net/Kconfig	2006-04-26 10:15:53.000000000 -0700
@@ -2183,7 +2183,7 @@

 config SPIDER_NET
 	tristate "Spider Gigabit Ethernet driver"
-	depends on PCI && PPC_CELL
+	depends on PCI && PPC_IBM_CELL_BLADE
 	select FW_LOADER
 	help
 	  This driver supports the Gigabit Ethernet chips present on the