[POWERPC] move 82xx/83xx/86xx Kconfig options to platform selection

The cores used in the MPC82xx/83xx/86xx embedded controllers are very similar
to those in the 32 bit general-purpose processors, so it makes sense to
treat them as the same CPU family.

Choosing between the embedded platforms and the multiplatform code is
now done in the platform menu, but functionally everything stays the
same.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 24 insertions, 1 deletions

diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index d6c475ca311d..df67ff50c0da 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -2,7 +2,7 @@ menu "Platform support"
 
 choice
         prompt "Machine type"
-        depends on PPC64 || CLASSIC32
+        depends on PPC64 || 6xx
         default PPC_MULTIPLATFORM
 
 config PPC_MULTIPLATFORM
@@ -16,8 +16,31 @@ 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
+
+config PPC_83xx
+        bool "Freescale 83xx"
+        depends on 6xx
+        select FSL_SOC
+        select 83xx
+        select WANT_DEVICE_TREE
+
+config PPC_86xx
+        bool "Freescale 86xx"
+        depends on 6xx
+        select FSL_SOC
+        select FSL_PCIE
+        select ALTIVEC
+        help
+          The Freescale E600 SoCs have 74xx cores.
 endchoice
 
+config CLASSIC32
+        def_bool y
+        depends on 6xx && PPC_MULTIPLATFORM
+
 source "arch/powerpc/platforms/pseries/Kconfig"
 source "arch/powerpc/platforms/iseries/Kconfig"
 source "arch/powerpc/platforms/chrp/Kconfig"