1 files changed, 37 insertions, 16 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 6729c98b66f9..e922a88b2bad 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -45,6 +45,10 @@ config GENERIC_CALIBRATE_DELAY
         bool
         default y
 
+config GENERIC_FIND_NEXT_BIT
+        bool
+        default y
+
 config PPC
         bool
         default y
@@ -137,6 +141,15 @@ config PPC_85xx
         select FSL_SOC
         select 85xx
 
+config PPC_86xx
+        bool "Freescale 86xx"
+        select 6xx
+        select FSL_SOC
+        select PPC_FPU
+        select ALTIVEC
+        help
+          The Freescale E600 SoCs have 74xx cores.
+
 config 40x
         bool "AMCC 40x"
 
@@ -336,7 +349,7 @@ endchoice
 
 config PPC_PSERIES
         depends on PPC_MULTIPLATFORM && PPC64
-        bool "  IBM pSeries & new (POWER5-based) iSeries"
+        bool "IBM pSeries & new (POWER5-based) iSeries"
         select PPC_I8259
         select PPC_RTAS
         select RTAS_ERROR_LOGGING
@@ -344,7 +357,7 @@ config PPC_PSERIES
         default y
 
 config PPC_CHRP
-        bool "  Common Hardware Reference Platform (CHRP) based machines"
+        bool "Common Hardware Reference Platform (CHRP) based machines"
         depends on PPC_MULTIPLATFORM && PPC32
         select PPC_I8259
         select PPC_INDIRECT_PCI
@@ -354,7 +367,7 @@ config PPC_CHRP
         default y
 
 config PPC_PMAC
-        bool "  Apple PowerMac based machines"
+        bool "Apple PowerMac based machines"
         depends on PPC_MULTIPLATFORM
         select PPC_INDIRECT_PCI if PPC32
         select PPC_MPC106 if PPC32
@@ -370,7 +383,7 @@ config PPC_PMAC64
         default y
 
 config PPC_PREP
-        bool "  PowerPC Reference Platform (PReP) based machines"
+        bool "PowerPC Reference Platform (PReP) based machines"
         depends on PPC_MULTIPLATFORM && PPC32 && BROKEN
         select PPC_I8259
         select PPC_INDIRECT_PCI
@@ -379,7 +392,7 @@ config PPC_PREP
 
 config PPC_MAPLE
         depends on PPC_MULTIPLATFORM && PPC64
-        bool "  Maple 970FX Evaluation Board"
+        bool "Maple 970FX Evaluation Board"
         select U3_DART
         select MPIC_BROKEN_U3
         select GENERIC_TBSYNC
@@ -391,8 +404,18 @@ config PPC_MAPLE
           For more informations, refer to <http://www.970eval.com>
 
 config PPC_CELL
-        bool "  Cell Broadband Processor Architecture"
+        bool
+        default n
+
+config PPC_CELL_NATIVE
+        bool
+        select PPC_CELL
+        default n
+
+config PPC_IBM_CELL_BLADE
+        bool "  IBM Cell Blade"
         depends on PPC_MULTIPLATFORM && PPC64
+        select PPC_CELL_NATIVE
         select PPC_RTAS
         select MMIO_NVRAM
         select PPC_UDBG_16550
@@ -439,11 +462,6 @@ config MPIC_BROKEN_U3
         depends on PPC_MAPLE
         default y
 
-config CELL_IIC
-        depends on PPC_CELL
-        bool
-        default y
-
 config IBMVIO
         depends on PPC_PSERIES || PPC_ISERIES
         bool
@@ -545,6 +563,7 @@ source arch/powerpc/platforms/embedded6xx/Kconfig
 source arch/powerpc/platforms/4xx/Kconfig
 source arch/powerpc/platforms/83xx/Kconfig
 source arch/powerpc/platforms/85xx/Kconfig
+source arch/powerpc/platforms/86xx/Kconfig
 source arch/powerpc/platforms/8xx/Kconfig
 source arch/powerpc/platforms/cell/Kconfig
 
@@ -699,7 +718,6 @@ config PPC_64K_PAGES
 config SCHED_SMT
         bool "SMT (Hyperthreading) scheduler support"
         depends on PPC64 && SMP
-        default off
         help
           SMT scheduler support improves the CPU scheduler's decision making
           when dealing with POWER5 cpus at a cost of slightly increased
@@ -776,6 +794,7 @@ config GENERIC_ISA_DMA
 
 config PPC_I8259
         bool
+        default y if MPC8641_HPCN
         default n
 
 config PPC_INDIRECT_PCI
@@ -798,8 +817,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 || PPC_85xx || PPC_86xx || PPC_MPC52xx || (EMBEDDED && PPC_ISERIES)
+        default y if !40x && !CPM2 && !8xx && !APUS && !PPC_83xx && !PPC_85xx && !PPC_86xx
         default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS
         default PCI_QSPAN if !4xx && !CPM2 && 8xx
         help
@@ -827,12 +846,12 @@ config PCI_8260
         default y
 
 config 8260_PCI9
-        bool "  Enable workaround for MPC826x erratum PCI 9"
+        bool "Enable workaround for MPC826x erratum PCI 9"
         depends on PCI_8260 && !ADS8272
         default y
 
 choice
-        prompt "  IDMA channel for PCI 9 workaround"
+        prompt "IDMA channel for PCI 9 workaround"
         depends on 8260_PCI9
 
 config 8260_PCI9_IDMA1
@@ -849,6 +868,8 @@ config 8260_PCI9_IDMA4
 
 endchoice
 
+source "drivers/pci/pcie/Kconfig"
+
 source "drivers/pci/Kconfig"
 
 source "drivers/pcmcia/Kconfig"