Merge branch 'for_linus' of git://git.infradead.org/~dedekind/ubifs-2.6

[pandora-kernel.git] / arch / powerpc / platforms / Kconfig.cputype

diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index 0c3face..5bc4b61 100644 (file)
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -41,11 +41,13 @@ config 40x
        bool "AMCC 40x"
        select PPC_DCR_NATIVE
        select PPC_UDBG_16550
+       select 4xx_SOC
 
 config 44x
        bool "AMCC 44x"
        select PPC_DCR_NATIVE
        select PPC_UDBG_16550
+       select 4xx_SOC
 
 config E200
        bool "Freescale e200"
@@ -93,6 +95,11 @@ config E500
        select FSL_EMB_PERFMON
        bool
 
+config PPC_E500MC
+       bool "e500mc Support"
+       select PPC_FPU
+       depends on E500
+
 config PPC_FPU
        bool
        default y if PPC64
@@ -153,9 +160,25 @@ config ALTIVEC
 
          If in doubt, say Y here.
 
+config VSX
+       bool "VSX Support"
+       depends on POWER4 && ALTIVEC && PPC_FPU
+       ---help---
+
+         This option enables kernel support for the Vector Scaler extensions
+         to the PowerPC processor. The kernel currently supports saving and
+         restoring VSX registers, and turning on the 'VSX enable' bit so user
+         processes can execute VSX instructions.
+
+         This option is only useful if you have a processor that supports
+         VSX (P7 and above), but does not have any affect on a non-VSX
+         CPUs (it does, however add code to the kernel).
+
+         If in doubt, say Y here.
+
 config SPE
        bool "SPE Support"
-       depends on E200 || E500
+       depends on E200 || (E500 && !PPC_E500MC)
        default y
        ---help---
          This option enables kernel support for the Signal Processing
@@ -180,7 +203,7 @@ config PPC_STD_MMU_32
 
 config PPC_MM_SLICES
        bool
-       default y if HUGETLB_PAGE
+       default y if HUGETLB_PAGE || PPC_64K_PAGES
        default n
 
 config VIRT_CPU_ACCOUNTING
@@ -218,8 +241,8 @@ config SMP
          If you don't know what to do here, say N.
 
 config NR_CPUS
-       int "Maximum number of CPUs (2-128)"
-       range 2 128
+       int "Maximum number of CPUs (2-1024)"
+       range 2 1024
        depends on SMP
        default "32" if PPC64
        default "4"