linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 7470259..e4d1963 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -37,10 +37,6 @@ config RWSEM_XCHGADD_ALGORITHM
        bool
        default y
 
-config GENERIC_HWEIGHT
-       bool
-       default y
-
 config GENERIC_CALIBRATE_DELAY
        bool
        default y
@@ -131,12 +127,6 @@ config PPC_83xx
        select 83xx
        select PPC_FPU
 
-config PPC_85xx
-       bool "Freescale 85xx"
-       select E500
-       select FSL_SOC
-       select 85xx
-
 config 40x
        bool "AMCC 40x"
 
@@ -149,6 +139,8 @@ config 8xx
 config E200
        bool "Freescale e200"
 
+config E500
+       bool "Freescale e500"
 endchoice
 
 config POWER4_ONLY
@@ -176,13 +168,6 @@ config 6xx
 config 83xx
        bool
 
-# this is temp to handle compat with arch=ppc
-config 85xx
-       bool
-
-config E500
-       bool
-
 config PPC_FPU
        bool
        default y if PPC64
@@ -232,7 +217,6 @@ config ALTIVEC
 config SPE
        bool "SPE Support"
        depends on E200 || E500
-       default y
        ---help---
          This option enables kernel support for the Signal Processing
          Extensions (SPE) to the PowerPC processor. The kernel currently
@@ -254,21 +238,6 @@ config PPC_STD_MMU_32
        def_bool y
        depends on PPC_STD_MMU && PPC32
 
-config VIRT_CPU_ACCOUNTING
-       bool "Deterministic task and CPU time accounting"
-       depends on PPC64
-       default y
-       help
-         Select this option to enable more accurate task and CPU time
-         accounting.  This is done by reading a CPU counter on each
-         kernel entry and exit and on transitions within the kernel
-         between system, softirq and hardirq state, so there is a
-         small performance impact.  This also enables accounting of
-         stolen time on logically-partitioned systems running on
-         IBM POWER5-based machines.
-
-         If in doubt, say Y here.
-
 config SMP
        depends on PPC_STD_MMU
        bool "Symmetric multi-processing support"
@@ -366,7 +335,6 @@ config PPC_PMAC64
        select U3_DART
        select MPIC_BROKEN_U3
        select GENERIC_TBSYNC
-       select PPC_970_NAP
        default y
 
 config PPC_PREP
@@ -384,7 +352,6 @@ config PPC_MAPLE
        select MPIC_BROKEN_U3
        select GENERIC_TBSYNC
        select PPC_UDBG_16550
-       select PPC_970_NAP
        default n
        help
           This option enables support for the Maple 970FX Evaluation Board.
@@ -397,27 +364,6 @@ config PPC_CELL
        select MMIO_NVRAM
        select PPC_UDBG_16550
 
-# Systemsim configuration
-config MAMBO
-        bool "  IBM Full System Simulator (systemsim) support"
-        default n
-        ---help---
-           Support booting resulting image under IBMs Full System Simulator.
-config MAMBO_DISK
-        depends on MAMBO
-        tristate "    IBM Full System Simulator Bogus Disk Support"
-        default y
-        ---help---
-           Provides quick access to disk images in the simulator without
-           simulating a full IDE or SCSI device.
-config MAMBO_NET
-        depends on MAMBO
-        tristate "    IBM Full System Simulator Bogus Network Support"
-        default y
-        ---help---
-           Provides quick access to a raw ethernet device in the simulator
-           without simulating any specific network device hardware.
-
 config XICS
        depends on PPC_PSERIES
        bool
@@ -480,10 +426,6 @@ config PPC_MPC106
        bool
        default n
 
-config PPC_970_NAP
-       bool
-       default n
-
 source "drivers/cpufreq/Kconfig"
 
 config CPU_FREQ_PMAC
@@ -518,7 +460,7 @@ config PPC601_SYNC_FIX
          If in doubt, say Y here.
 
 config TAU
-       bool "On-chip CPU temperature sensor support"
+       bool "Thermal Management Support"
        depends on 6xx
        help
          G3 and G4 processors have an on-chip temperature sensor called the
@@ -527,7 +469,7 @@ config TAU
          on-die temperature in /proc/cpuinfo if the cpu supports it.
 
          Unfortunately, on some chip revisions, this sensor is very inaccurate
-         and in many cases, does not work at all, so don't assume the cpu
+         and in some cases, does not work at all, so don't assume the cpu
          temp is actually what /proc/cpuinfo says it is.
 
 config TAU_INT
@@ -620,6 +562,9 @@ config HOTPLUG_CPU
 
          Say N if you are unsure.
 
+config ARCH_ENABLE_MEMORY_HOTPLUG
+       def_bool y
+
 config KEXEC
        bool "kexec system call (EXPERIMENTAL)"
        depends on PPC_MULTIPLATFORM && EXPERIMENTAL
@@ -676,11 +621,6 @@ config NUMA
        depends on PPC64
        default y if SMP && PPC_PSERIES
 
-config NODES_SHIFT
-       int
-       default "4"
-       depends on NEED_MULTIPLE_NODES
-
 config ARCH_SELECT_MEMORY_MODEL
        def_bool y
        depends on PPC64
@@ -797,12 +737,13 @@ config GENERIC_ISA_DMA
 
 config PPC_I8259
        bool
+       default y if 85xx
        default n
 
 config PPC_INDIRECT_PCI
        bool
        depends on PCI
-       default y if 40x || 44x
+       default y if 40x || 44x || 85xx
        default n
 
 config EISA
@@ -819,8 +760,8 @@ config MCA
        bool
 
 config PCI
-       bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_MPC52xx || (EMBEDDED && PPC_ISERIES)
-       default y if !40x && !CPM2 && !8xx && !APUS && !PPC_83xx && !PPC_85xx
+       bool "PCI support" if 40x || CPM2 || PPC_83xx || 85xx || PPC_MPC52xx || (EMBEDDED && PPC_ISERIES)
+       default y if !40x && !CPM2 && !8xx && !APUS && !PPC_83xx && !85xx
        default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS
        default PCI_QSPAN if !4xx && !CPM2 && 8xx
        help