Merge tag 'powerpc-4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

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

diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index a429d859f15d7ae04635453b0089131a596a56fc..67d3125d06100b24390e7ba70cdc151e330de46f 100644 (file)
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -61,7 +61,7 @@ choice
        help
          There are two families of 64 bit PowerPC chips supported.
          The most common ones are the desktop and server CPUs
-         (POWER4, POWER5, 970, POWER5+, POWER6, POWER7, POWER8 ...)
+         (POWER5, 970, POWER5+, POWER6, POWER7, POWER8, POWER9 ...)
 
          The other are the "embedded" processors compliant with the
          "Book 3E" variant of the architecture
@@ -87,7 +87,6 @@ endchoice
 choice
        prompt "CPU selection"
        depends on PPC64
-       default POWER8_CPU if CPU_LITTLE_ENDIAN
        default GENERIC_CPU
        help
          This will create a kernel which is optimised for a particular CPU.
@@ -96,17 +95,18 @@ choice
          If unsure, select Generic.
 
 config GENERIC_CPU
-       bool "Generic"
+       bool "Generic (POWER4 and above)"
        depends on !CPU_LITTLE_ENDIAN
 
+config GENERIC_CPU
+       bool "Generic (POWER8 and above)"
+       depends on CPU_LITTLE_ENDIAN
+       select ARCH_HAS_FAST_MULTIPLIER
+
 config CELL_CPU
        bool "Cell Broadband Engine"
        depends on PPC_BOOK3S_64 && !CPU_LITTLE_ENDIAN
 
-config POWER4_CPU
-       bool "POWER4"
-       depends on PPC_BOOK3S_64 && !CPU_LITTLE_ENDIAN
-
 config POWER5_CPU
        bool "POWER5"
        depends on PPC_BOOK3S_64 && !CPU_LITTLE_ENDIAN
@@ -125,6 +125,11 @@ config POWER8_CPU
        depends on PPC_BOOK3S_64
        select ARCH_HAS_FAST_MULTIPLIER
 
+config POWER9_CPU
+       bool "POWER9"
+       depends on PPC_BOOK3S_64
+       select ARCH_HAS_FAST_MULTIPLIER
+
 config E5500_CPU
        bool "Freescale e5500"
        depends on E500
@@ -326,6 +331,7 @@ config PPC_BOOK3E_MMU
 config PPC_MM_SLICES
        bool
        default y if PPC_BOOK3S_64
+       default y if PPC_8xx && HUGETLB_PAGE
        default n
 
 config PPC_HAVE_PMU_SUPPORT