powerpc/kconfig: Kill PPC_MULTIPLATFORM

[deliverable/linux.git] / arch / powerpc / platforms / Kconfig.cputype

diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index 3d0c776f888d83f96d666b789f7595f2ad6a2dbc..9da795e49337d0ae14e0357ba00aae37d4f41df1 100644 (file)
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -57,9 +57,17 @@ config E200
 
 endchoice
 
 
 endchoice
 

+# Until we have a choice of exclusive CPU types on 64-bit, we always
+# use PPC_BOOK3S. On 32-bit, this is equivalent to 6xx which is
+# "classic" MMU
+
+config PPC_BOOK3S
+       def_bool y
+       depends on PPC64 || 6xx
+

 config POWER4_ONLY
        bool "Optimize for POWER4"
 config POWER4_ONLY
        bool "Optimize for POWER4"

-       depends on PPC64
+       depends on PPC64 && PPC_BOOK3S

        default n
        ---help---
          Cause the compiler to optimize for POWER4/POWER5/PPC970 processors.
        default n
        ---help---
          Cause the compiler to optimize for POWER4/POWER5/PPC970 processors.


@@ -68,16 +76,16 @@ config POWER4_ONLY
 
 config POWER3
        bool
 
 config POWER3
        bool

-       depends on PPC64
+       depends on PPC64 && PPC_BOOK3S

        default y if !POWER4_ONLY
 
 config POWER4
        default y if !POWER4_ONLY
 
 config POWER4

-       depends on PPC64
+       depends on PPC64 && PPC_BOOK3S

        def_bool y
 
 config TUNE_CELL
        bool "Optimize for Cell Broadband Engine"
        def_bool y
 
 config TUNE_CELL
        bool "Optimize for Cell Broadband Engine"

-       depends on PPC64
+       depends on PPC64 && PPC_BOOK3S

        help
          Cause the compiler to optimize for the PPE of the Cell Broadband
          Engine. This will make the code run considerably faster on Cell
        help
          Cause the compiler to optimize for the PPE of the Cell Broadband
          Engine. This will make the code run considerably faster on Cell


@@ -147,7 +155,7 @@ config PHYS_64BIT
 
 config ALTIVEC
        bool "AltiVec Support"
 
 config ALTIVEC
        bool "AltiVec Support"

-       depends on CLASSIC32 || POWER4
+       depends on 6xx || POWER4

        ---help---
          This option enables kernel support for the Altivec extensions to the
          PowerPC processor. The kernel currently supports saving and restoring
        ---help---
          This option enables kernel support for the Altivec extensions to the
          PowerPC processor. The kernel currently supports saving and restoring


@@ -210,6 +218,10 @@ config PPC_MMU_NOHASH
        def_bool y
        depends on !PPC_STD_MMU
 
        def_bool y
        depends on !PPC_STD_MMU
 

+config PPC_BOOK3E_MMU
+       def_bool y
+       depends on FSL_BOOKE
+

 config PPC_MM_SLICES
        bool
        default y if HUGETLB_PAGE || (PPC_STD_MMU_64 && PPC_64K_PAGES)
 config PPC_MM_SLICES
        bool
        default y if HUGETLB_PAGE || (PPC_STD_MMU_64 && PPC_64K_PAGES)


@@ -231,7 +243,7 @@ config VIRT_CPU_ACCOUNTING
          If in doubt, say Y here.
 
 config SMP
          If in doubt, say Y here.
 
 config SMP

-       depends on PPC_STD_MMU
+       depends on PPC_STD_MMU || FSL_BOOKE

        bool "Symmetric multi-processing support"
        ---help---
          This enables support for systems with more than one CPU. If you have
        bool "Symmetric multi-processing support"
        ---help---
          This enables support for systems with more than one CPU. If you have