1 files changed, 32 insertions, 6 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index dfba81719dec..fae42da7468d 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -127,6 +127,12 @@ 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"
 
@@ -139,8 +145,6 @@ config 8xx
 config E200
         bool "Freescale e200"
 
-config E500
-        bool "Freescale e500"
 endchoice
 
 config POWER4_ONLY
@@ -168,6 +172,13 @@ 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
@@ -217,6 +228,7 @@ 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
@@ -238,6 +250,21 @@ 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"
@@ -734,13 +761,12 @@ 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 || 85xx
+        default y if 40x || 44x
         default n
 
 config EISA
@@ -757,8 +783,8 @@ config MCA
         bool
 
 config PCI
-        bool "PCI support" if 40x || CPM2 || PPC_83xx || 85xx || PPC_MPC52xx || (EMBEDDED && PPC_ISERIES)
-        default y if !40x && !CPM2 && !8xx && !APUS && !PPC_83xx && !85xx
+        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
         default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS
         default PCI_QSPAN if !4xx && !CPM2 && 8xx
         help