Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / Kconfig

diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 361acfa2894c77839efe1470208457ee512f54b9..33545d352e9234af9d2d08e0820450bb31aef5be 100644 (file)
--- 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,15 +16,30 @@ config EMBEDDED6xx
        bool "Embedded 6xx/7xx/7xxx-based board"
        depends on PPC32 && (BROKEN||BROKEN_ON_SMP)
 
-config APUS
-       bool "Amiga-APUS"
-       depends on PPC32 && BROKEN
+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 ALTIVEC
        help
-         Select APUS if configuring for a PowerUP Amiga.
-         More information is available at:
-         <http://linux-apus.sourceforge.net/>.
+         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"