[POWERPC] Split cell platforms into their respective Kconfig file

Cleaning up arch/powerpc/Kconfig platform support.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index ecc4302bfd0225e214f0690900f5e7ba31f5b295..479828daaeccdd03b7584cb17210429f3c914311 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -475,54 +475,9 @@ config PPC_PASEMI
          This option enables support for PA Semi's PWRficient line
          of SoC processors, including PA6T-1682M
 
-config PPC_CELL
-       bool
-       default n
-
-config PPC_CELL_NATIVE
-       bool
-       select PPC_CELL
-       select PPC_DCR_MMIO
-       select PPC_OF_PLATFORM_PCI
-       select PPC_INDIRECT_IO
-       select PPC_NATIVE
-       select MPIC
-       default n
-
-config PPC_IBM_CELL_BLADE
-       bool "IBM Cell Blade"
-       depends on PPC_MULTIPLATFORM && PPC64
-       select PPC_CELL_NATIVE
-       select PPC_RTAS
-       select MMIO_NVRAM
-       select PPC_UDBG_16550
-       select UDBG_RTAS_CONSOLE
-
-config PPC_PS3
-       bool "Sony PS3 (incomplete)"
-       depends on PPC_MULTIPLATFORM && PPC64
-       select PPC_CELL
-       select USB_ARCH_HAS_OHCI
-       select USB_OHCI_LITTLE_ENDIAN
-       select USB_OHCI_BIG_ENDIAN_MMIO
-       select USB_ARCH_HAS_EHCI
-       select USB_EHCI_BIG_ENDIAN_MMIO
-       help
-         This option enables support for the Sony PS3 game console
-         and other platforms using the PS3 hypervisor.
-         Support for this platform is not yet complete, so
-         enabling this will not result in a bootable kernel on a
-         PS3 system.
-
-config PPC_CELLEB
-       bool "Toshiba's Cell Reference Set 'Celleb' Architecture"
-       depends on PPC_MULTIPLATFORM && PPC64
-       select PPC_CELL
-       select PPC_OF_PLATFORM_PCI
-       select HAS_TXX9_SERIAL
-       select PPC_UDBG_BEAT
-       select USB_OHCI_BIG_ENDIAN_MMIO
-       select USB_EHCI_BIG_ENDIAN_MMIO
+source arch/powerpc/platforms/celleb/Kconfig
+source arch/powerpc/platforms/ps3/Kconfig
+source arch/powerpc/platforms/cell/Kconfig
 
 config PPC_NATIVE
        bool
@@ -702,8 +657,6 @@ source arch/powerpc/platforms/83xx/Kconfig
 source arch/powerpc/platforms/85xx/Kconfig
 source arch/powerpc/platforms/86xx/Kconfig
 source arch/powerpc/platforms/8xx/Kconfig
-source arch/powerpc/platforms/cell/Kconfig
-source arch/powerpc/platforms/ps3/Kconfig
 source arch/powerpc/platforms/pasemi/Kconfig
 
 menu "Kernel options"

diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig
index 06a85b7043315550dadf0c63bdfe38acaa7c8aa2..53913a26ef4277e636ce92c815ca397b3ea7ff36 100644 (file)
--- a/arch/powerpc/platforms/cell/Kconfig
+++ b/arch/powerpc/platforms/cell/Kconfig
@@ -1,3 +1,26 @@
+config PPC_CELL
+       bool
+       default n
+
+config PPC_CELL_NATIVE
+       bool
+       select PPC_CELL
+       select PPC_DCR_MMIO
+       select PPC_OF_PLATFORM_PCI
+       select PPC_INDIRECT_IO
+       select PPC_NATIVE
+       select MPIC
+       default n
+
+config PPC_IBM_CELL_BLADE
+       bool "IBM Cell Blade"
+       depends on PPC_MULTIPLATFORM && PPC64
+       select PPC_CELL_NATIVE
+       select PPC_RTAS
+       select MMIO_NVRAM
+       select PPC_UDBG_16550
+       select UDBG_RTAS_CONSOLE
+
 menu "Cell Broadband Engine options"
        depends on PPC_CELL
 

diff --git a/arch/powerpc/platforms/celleb/Kconfig b/arch/powerpc/platforms/celleb/Kconfig
new file mode 100644 (file)
index 0000000..2db1e29
--- /dev/null
+++ b/arch/powerpc/platforms/celleb/Kconfig
@@ -0,0 +1,9 @@
+config PPC_CELLEB
+       bool "Toshiba's Cell Reference Set 'Celleb' Architecture"
+       depends on PPC_MULTIPLATFORM && PPC64
+       select PPC_CELL
+       select PPC_OF_PLATFORM_PCI
+       select HAS_TXX9_SERIAL
+       select PPC_UDBG_BEAT
+       select USB_OHCI_BIG_ENDIAN_MMIO
+       select USB_EHCI_BIG_ENDIAN_MMIO

diff --git a/arch/powerpc/platforms/ps3/Kconfig b/arch/powerpc/platforms/ps3/Kconfig
index 1a481a60a883db69f33e96a1a35c0b0de09bf19f..40f0008af4d1a9af93c7f85bffe2e640594f9581 100644 (file)
--- a/arch/powerpc/platforms/ps3/Kconfig
+++ b/arch/powerpc/platforms/ps3/Kconfig
@@ -1,3 +1,19 @@
+config PPC_PS3
+       bool "Sony PS3 (incomplete)"
+       depends on PPC_MULTIPLATFORM && PPC64
+       select PPC_CELL
+       select USB_ARCH_HAS_OHCI
+       select USB_OHCI_LITTLE_ENDIAN
+       select USB_OHCI_BIG_ENDIAN_MMIO
+       select USB_ARCH_HAS_EHCI
+       select USB_EHCI_BIG_ENDIAN_MMIO
+       help
+         This option enables support for the Sony PS3 game console
+         and other platforms using the PS3 hypervisor.
+         Support for this platform is not yet complete, so
+         enabling this will not result in a bootable kernel on a
+         PS3 system.
+
 menu "PS3 Platform Options"
        depends on PPC_PS3