Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight

[linux-2.6] / arch / powerpc / platforms / Kconfig.cputype

diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index 597272ee9ddc1eeac7d7f06692caf115f617a352..e4b2aee53a73f2ce9815b5d63e19b318c44de006 100644 (file)
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -10,41 +10,20 @@ choice
        prompt "Processor Type"
        depends on PPC32
        default 6xx
-
-config CLASSIC32
-       bool "52xx/6xx/7xx/74xx"
-       select PPC_FPU
-       select 6xx
        help
-         There are four families of PowerPC chips supported.  The more common
-         types (601, 603, 604, 740, 750, 7400), the Motorola embedded
-         versions (821, 823, 850, 855, 860, 52xx, 82xx, 83xx), the AMCC
-         embedded versions (403 and 405) and the high end 64 bit Power
-         processors (POWER 3, POWER4, and IBM PPC970 also known as G5).
-
-         This option is the catch-all for 6xx types, including some of the
-         embedded versions.  Unless there is see an option for the specific
-         chip family you are using, you want this option.
-
-         You do not want this if you are building a kernel for a 64 bit
-         IBM RS/6000 or an Apple G5, choose 6xx.
+         There are five families of 32 bit PowerPC chips supported.
+         The most common ones are the desktop and server CPUs (601, 603,
+         604, 740, 750, 74xx) CPUs from Freescale and IBM, with their
+         embedded 52xx/82xx/83xx/86xx counterparts.
+         The other embeeded parts, namely 4xx, 8xx, e200 (55xx) and e500
+         (85xx) each form a family of their own that is not compatible
+         with the others.
 
-         If unsure, select this option
-
-         Note that the kernel runs in 32-bit mode even on 64-bit chips.
-
-config PPC_82xx
-       bool "Freescale 82xx"
-       select 6xx
-       select PPC_FPU
+         If unsure, select 52xx/6xx/7xx/74xx/82xx/83xx/86xx.
 
-config PPC_83xx
-       bool "Freescale 83xx"
-       select 6xx
-       select FSL_SOC
-       select 83xx
+config 6xx
+       bool "52xx/6xx/7xx/74xx/82xx/83xx/86xx"
        select PPC_FPU
-       select WANT_DEVICE_TREE
 
 config PPC_85xx
        bool "Freescale 85xx"
@@ -53,16 +32,6 @@ config PPC_85xx
        select 85xx
        select WANT_DEVICE_TREE
 
-config PPC_86xx
-       bool "Freescale 86xx"
-       select 6xx
-       select FSL_SOC
-       select FSL_PCIE
-       select PPC_FPU
-       select ALTIVEC
-       help
-         The Freescale E600 SoCs have 74xx cores.
-
 config PPC_8xx
        bool "Freescale 8xx"
        select FSL_SOC
@@ -246,7 +215,7 @@ config NOT_COHERENT_CACHE
        depends on 4xx || 8xx || E200
        default y
 
-config CONFIG_CHECK_CACHE_COHERENCY
+config CHECK_CACHE_COHERENCY
        bool
 
 endmenu