Merge branch 'linus' into core/generic-dma-coherent

[pandora-kernel.git] / arch / powerpc / platforms / embedded6xx / Kconfig

diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig
index 8924095..4f9f818 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/Kconfig
+++ b/arch/powerpc/platforms/embedded6xx/Kconfig
@@ -9,6 +9,8 @@ config LINKSTATION
        select FSL_SOC
        select PPC_UDBG_16550 if SERIAL_8250
        select DEFAULT_UIMAGE
+       select MPC10X_OPENPIC
+       select MPC10X_BRIDGE
        help
          Select LINKSTATION if configuring for one of PPC- (MPC8241)
          based NAS systems from Buffalo Technology. So far only
@@ -16,13 +18,25 @@ config LINKSTATION
          Linkstation-I HD-HLAN and HD-HGLAN versions, and PPC-based
          Terastation systems should be supported too.
 
+config STORCENTER
+       bool "IOMEGA StorCenter"
+       depends on EMBEDDED6xx
+       select MPIC
+       select FSL_SOC
+       select PPC_UDBG_16550 if SERIAL_8250
+       select MPC10X_OPENPIC
+       select MPC10X_BRIDGE
+       help
+         Select STORCENTER if configuring for the iomega StorCenter
+         with an 8241 CPU in it.
+
 config MPC7448HPC2
        bool "Freescale MPC7448HPC2(Taiga)"
        depends on EMBEDDED6xx
        select TSI108_BRIDGE
        select DEFAULT_UIMAGE
        select PPC_UDBG_16550
-       select WANT_DEVICE_TREE
+       select TSI108_BRIDGE
        help
          Select MPC7448HPC2 if configuring for Freescale MPC7448HPC2 (Taiga)
          platform
@@ -32,7 +46,7 @@ config PPC_HOLLY
        depends on EMBEDDED6xx
        select TSI108_BRIDGE
        select PPC_UDBG_16550
-       select WANT_DEVICE_TREE
+       select TSI108_BRIDGE
        help
          Select PPC_HOLLY if configuring for an IBM 750GX/CL Eval
          Board with TSI108/9 bridge (Hickory/Holly)
@@ -42,23 +56,28 @@ config PPC_PRPMC2800
        depends on EMBEDDED6xx
        select MV64X60
        select NOT_COHERENT_CACHE
-       select WANT_DEVICE_TREE
        help
          This option enables support for the Motorola PrPMC2800 board
 
+config PPC_C2K
+       bool "SBS/GEFanuc C2K board"
+       depends on EMBEDDED6xx
+       select MV64X60
+       select NOT_COHERENT_CACHE
+       select MTD_CFI_I4
+       help
+         This option enables support for the GE Fanuc C2K board (formerly
+         an SBS board).
+
 config TSI108_BRIDGE
        bool
-       depends on MPC7448HPC2 || PPC_HOLLY
        select PCI
        select MPIC
        select MPIC_WEIRD
-       default y
 
 config MPC10X_BRIDGE
        bool
-       depends on LINKSTATION
        select PPC_INDIRECT_PCI
-       default y
 
 config MV64X60
        bool
@@ -67,8 +86,6 @@ config MV64X60
 
 config MPC10X_OPENPIC
        bool
-       depends on LINKSTATION
-       default y
 
 config MPC10X_STORE_GATHERING
        bool "Enable MPC10x store gathering"