Pull button into test branch

[linux-drm-fsl-dcu.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 7b63ede083f2add8e57913dc95fdaa6c6e1e45f4..8699dadcd0966028ed7207b333486b2295a4fc12 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -41,6 +41,14 @@ config RWSEM_XCHGADD_ALGORITHM
        bool
        default y
 
+config ARCH_HAS_ILOG2_U32
+       bool
+       default y
+
+config ARCH_HAS_ILOG2_U64
+       bool
+       default y if 64BIT
+
 config GENERIC_HWEIGHT
        bool
        default y
@@ -99,6 +107,11 @@ config AUDIT_ARCH
        bool
        default y
 
+config GENERIC_BUG
+       bool
+       default y
+       depends on BUG
+
 config DEFAULT_UIMAGE
        bool
        help
@@ -112,7 +125,7 @@ choice
        default 6xx
 
 config CLASSIC32
-       bool "6xx/7xx/74xx"
+       bool "52xx/6xx/7xx/74xx"
        select PPC_FPU
        select 6xx
        help
@@ -121,16 +134,18 @@ config CLASSIC32
          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.
+         
+         If unsure, select this option
          
-         Unless you are building a kernel for one of the embedded processor
-         systems, 64 bit IBM RS/6000 or an Apple G5, choose 6xx.
          Note that the kernel runs in 32-bit mode even on 64-bit chips.
 
-config PPC_52xx
-       bool "Freescale 52xx"
-       select 6xx
-       select PPC_FPU
-       
 config PPC_82xx
        bool "Freescale 82xx"
        select 6xx
@@ -468,6 +483,7 @@ config PPC_MAPLE
        select PPC_UDBG_16550
        select PPC_970_NAP
        select PPC_NATIVE
+       select PPC_RTAS
        default n
        help
           This option enables support for the Maple 970FX Evaluation Board.
@@ -704,7 +720,7 @@ config FORCE_MAX_ZONEORDER
 
 config MATH_EMULATION
        bool "Math emulation"
-       depends on 4xx || 8xx || E200 || E500
+       depends on 4xx || 8xx || E200 || PPC_83xx || E500
        ---help---
          Some PowerPC chips designed for embedded applications do not have
          a floating-point unit and therefore do not implement the