Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[firefly-linux-kernel-4.4.55.git] / arch / powerpc / platforms / Kconfig.cputype

diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index 9c80fc07384a386e473474a0a3353a06109e642f..61c9550819a255395aff1403d348e19dc4a538e3 100644 (file)
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -78,6 +78,36 @@ config PPC_BOOK3E_64
 
 endchoice
 
+choice
+       prompt "CPU selection"
+       depends on PPC64
+       default GENERIC_CPU
+       help
+         This will create a kernel which is optimised for a particular CPU.
+         The resulting kernel may not run on other CPUs, so use this with care.
+
+         If unsure, select Generic.
+
+config GENERIC_CPU
+       bool "Generic"
+
+config CELL_CPU
+       bool "Cell Broadband Engine"
+
+config POWER4_CPU
+       bool "POWER4"
+
+config POWER5_CPU
+       bool "POWER5"
+
+config POWER6_CPU
+       bool "POWER6"
+
+config POWER7_CPU
+       bool "POWER7"
+
+endchoice
+
 config PPC_BOOK3S
        def_bool y
        depends on PPC_BOOK3S_32 || PPC_BOOK3S_64
@@ -86,15 +116,6 @@ config PPC_BOOK3E
        def_bool y
        depends on PPC_BOOK3E_64
 
-config POWER4_ONLY
-       bool "Optimize for POWER4"
-       depends on PPC64 && PPC_BOOK3S
-       default n
-       ---help---
-         Cause the compiler to optimize for POWER4/POWER5/PPC970 processors.
-         The resulting binary will not work on POWER3 or RS64 processors
-         when compiled with binutils 2.15 or later.
-
 config 6xx
        def_bool y
        depends on PPC32 && PPC_BOOK3S