[POWERPC] Move embedded6xx into multiplatform

The various embedded 6xx systems can easily coexist in one kernel
together with the other 6xx based systems, so there is no strict
reason to keep them separate.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 78a7edac577f355845bf7835aef0f6094bb6c4a7..92fcd6e35b51e3d7f6d9babbd5f29f0cbea17da8 100644 (file)
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -12,10 +12,6 @@ config PPC_MULTIPLATFORM
          RS/6000 machine, an Apple machine, or a PReP, CHRP,
          Maple or Cell-based machine.
 
-config EMBEDDED6xx
-       bool "Embedded 6xx/7xx/7xxx-based board"
-       depends on PPC32 && (BROKEN||BROKEN_ON_SMP)
-
 config PPC_82xx
        bool "Freescale 82xx"
        depends on 6xx

diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig
index 2d12f77e46bcbee9987213561cfe7c2c5a022db6..da66103009c67c8693eb1a494d1313babd5b4756 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/Kconfig
+++ b/arch/powerpc/platforms/embedded6xx/Kconfig
@@ -1,9 +1,10 @@
-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
@@ -17,6 +18,7 @@ config LINKSTATION
 
 config MPC7448HPC2
        bool "Freescale MPC7448HPC2(Taiga)"
+       depends on EMBEDDED6xx
        select TSI108_BRIDGE
        select DEFAULT_UIMAGE
        select PPC_UDBG_16550
@@ -26,6 +28,7 @@ config MPC7448HPC2
 
 config PPC_HOLLY
        bool "PPC750GX/CL with TSI10x bridge (Hickory/Holly)"
+       depends on EMBEDDED6xx
        select TSI108_BRIDGE
        select PPC_UDBG_16550
        select WANT_DEVICE_TREE
@@ -35,12 +38,12 @@ config PPC_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