Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[safe/jmp/linux-2.6] / arch / powerpc / platforms / embedded6xx / Kconfig

diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig
index f2d2626..4290889 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/Kconfig
+++ b/arch/powerpc/platforms/embedded6xx/Kconfig
@@ -1,13 +1,16 @@
-choice
-       prompt "Machine Type"
-       depends on EMBEDDED6xx
+config EMBEDDED6xx
+       bool "Embedded 6xx/7xx/7xxx-based boards"
+       depends on PPC32 && BROKEN_ON_SMP && PPC_MULTIPLATFORM
 
 config LINKSTATION
        bool "Linkstation / Kurobox(HG) from Buffalo"
+       depends on EMBEDDED6xx
        select MPIC
        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
@@ -15,54 +18,64 @@ 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 TSI108_BRIDGE
        help
          Select MPC7448HPC2 if configuring for Freescale MPC7448HPC2 (Taiga)
          platform
 
 config PPC_HOLLY
        bool "PPC750GX/CL with TSI10x bridge (Hickory/Holly)"
+       depends on EMBEDDED6xx
        select TSI108_BRIDGE
        select PPC_UDBG_16550
+       select TSI108_BRIDGE
        help
          Select PPC_HOLLY if configuring for an IBM 750GX/CL Eval
          Board with TSI108/9 bridge (Hickory/Holly)
 
 config PPC_PRPMC2800
        bool "Motorola-PrPMC2800"
+       depends on EMBEDDED6xx
        select MV64X60
        select NOT_COHERENT_CACHE
-       select WANT_DEVICE_TREE
        help
          This option enables support for the Motorola PrPMC2800 board
-endchoice
 
 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
        select PPC_INDIRECT_PCI
-       select CONFIG_CHECK_CACHE_COHERENCY
+       select CHECK_CACHE_COHERENCY
 
 config MPC10X_OPENPIC
        bool
-       depends on LINKSTATION
-       default y
 
 config MPC10X_STORE_GATHERING
        bool "Enable MPC10x store gathering"