Merge branch 'srp' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

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

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index cd55c9b..f4e25c6 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -275,26 +275,39 @@ endchoice
 config PPC_PSERIES
        depends on PPC_MULTIPLATFORM && PPC64
        bool "  IBM pSeries & new (POWER5-based) iSeries"
+       select PPC_I8259
+       select PPC_RTAS
+       select RTAS_ERROR_LOGGING
        default y
 
 config PPC_CHRP
        bool "  Common Hardware Reference Platform (CHRP) based machines"
        depends on PPC_MULTIPLATFORM && PPC32
+       select PPC_I8259
+       select PPC_INDIRECT_PCI
+       select PPC_RTAS
+       select PPC_MPC106
        default y
 
 config PPC_PMAC
        bool "  Apple PowerMac based machines"
        depends on PPC_MULTIPLATFORM
+       select PPC_INDIRECT_PCI if PPC32
+       select PPC_MPC106 if PPC32
        default y
 
 config PPC_PMAC64
        bool
        depends on PPC_PMAC && POWER4
+       select U3_DART
+       select GENERIC_TBSYNC
        default y
 
 config PPC_PREP
        bool "  PowerPC Reference Platform (PReP) based machines"
        depends on PPC_MULTIPLATFORM && PPC32
+       select PPC_I8259
+       select PPC_INDIRECT_PCI
        default y
 
 config PPC_MAPLE
@@ -302,14 +315,17 @@ config PPC_MAPLE
        bool "  Maple 970FX Evaluation Board"
        select U3_DART
        select MPIC_BROKEN_U3
+       select GENERIC_TBSYNC
        default n
        help
           This option enables support for the Maple 970FX Evaluation Board.
          For more informations, refer to <http://www.970eval.com>
 
-config PPC_BPA
-       bool "  Broadband Processor Architecture"
+config PPC_CELL
+       bool "  Cell Broadband Processor Architecture"
        depends on PPC_MULTIPLATFORM && PPC64
+       select PPC_RTAS
+       select MMIO_NVRAM
 
 config PPC_OF
        bool
@@ -327,17 +343,39 @@ config U3_DART
        default n
 
 config MPIC
-       depends on PPC_PSERIES || PPC_PMAC || PPC_MAPLE
+       depends on PPC_PSERIES || PPC_PMAC || PPC_MAPLE || PPC_CHRP
+       bool
+       default y
+
+config PPC_RTAS
+       bool
+       default n
+
+config RTAS_ERROR_LOGGING
        bool
+       depends on PPC_RTAS
+       default n
+
+config RTAS_PROC
+       bool "Proc interface to RTAS"
+       depends on PPC_RTAS
        default y
 
+config RTAS_FLASH
+       tristate "Firmware flash interface"
+       depends on PPC64 && RTAS_PROC
+
+config MMIO_NVRAM
+       bool
+       default n
+
 config MPIC_BROKEN_U3
        bool
        depends on PPC_MAPLE
        default y
 
-config BPA_IIC
-       depends on PPC_BPA
+config CELL_IIC
+       depends on PPC_CELL
        bool
        default y
 
@@ -346,6 +384,15 @@ config IBMVIO
        bool
        default y
 
+config PPC_MPC106
+       bool
+       default n
+
+config GENERIC_TBSYNC
+       bool
+       default y if CONFIG_PPC32 && CONFIG_SMP
+       default n
+
 source "drivers/cpufreq/Kconfig"
 
 config CPU_FREQ_PMAC
@@ -512,6 +559,11 @@ config IRQ_ALL_CPUS
 
 source "arch/powerpc/platforms/pseries/Kconfig"
 
+config NUMA
+       bool "NUMA support"
+       depends on PPC64
+       default y if SMP && PPC_PSERIES
+
 config ARCH_SELECT_MEMORY_MODEL
        def_bool y
        depends on PPC64
@@ -528,10 +580,6 @@ config ARCH_DISCONTIGMEM_DEFAULT
        def_bool y
        depends on ARCH_DISCONTIGMEM_ENABLE
 
-config ARCH_FLATMEM_ENABLE
-       def_bool y
-       depends on PPC64
-
 config ARCH_SPARSEMEM_ENABLE
        def_bool y
        depends on ARCH_DISCONTIGMEM_ENABLE
@@ -555,10 +603,6 @@ config NODES_SPAN_OTHER_NODES
        def_bool y
        depends on NEED_MULTIPLE_NODES
 
-config NUMA
-       bool "NUMA support"
-       default y if DISCONTIGMEM || SPARSEMEM
-
 config SCHED_SMT
        bool "SMT (Hyperthreading) scheduler support"
        depends on PPC64 && SMP
@@ -569,12 +613,12 @@ config SCHED_SMT
          overhead in some places. If unsure say N here.
 
 config PROC_DEVICETREE
-       bool "Support for Open Firmware device tree in /proc"
-       depends on (PPC_OF || PPC_ISERIES) && PROC_FS
+       bool "Support for device tree in /proc"
+       depends on PROC_FS
        help
          This option adds a device-tree directory under /proc which contains
          an image of the device tree that the kernel copies from Open
-         Firmware. If unsure, say Y here.
+         Firmware or other boot firmware. If unsure, say Y here.
 
 source "arch/powerpc/platforms/prep/Kconfig"
 
@@ -624,6 +668,7 @@ menu "Bus options"
 config ISA
        bool "Support for ISA-bus hardware"
        depends on PPC_PREP || PPC_CHRP
+       select PPC_I8259
        help
          Find out whether you have ISA slots on your motherboard.  ISA is the
          name of a bus system, i.e. the way the CPU talks to the other stuff
@@ -636,6 +681,17 @@ config GENERIC_ISA_DMA
        depends on PPC64 || POWER4 || 6xx && !CPM2
        default y
 
+config PPC_I8259
+       bool
+       default y if 85xx
+       default n
+
+config PPC_INDIRECT_PCI
+       bool
+       depends on PCI
+       default y if 40x || 44x || 85xx || 83xx
+       default n
+
 config EISA
        bool
 
@@ -669,6 +725,7 @@ config MPC83xx_PCI2
 config PCI_QSPAN
        bool "QSpan PCI"
        depends on !4xx && !CPM2 && 8xx
+       select PPC_I8259
        help
          Say Y here if you have a system based on a Motorola 8xx-series
          embedded processor with a QSPAN PCI interface, otherwise say N.
@@ -676,6 +733,7 @@ config PCI_QSPAN
 config PCI_8260
        bool
        depends on PCI && 8260
+       select PPC_INDIRECT_PCI
        default y
 
 config 8260_PCI9