1 files changed, 59 insertions, 4 deletions

diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig
index 0f1fa289744e..cb27068bfcd4 100644
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
@@ -77,6 +77,10 @@ config PPC_PSERIES
         bool "  IBM pSeries & new iSeries"
         default y
 
+config PPC_BPA
+        bool "  Broadband Processor Architecture"
+        depends on PPC_MULTIPLATFORM
+
 config PPC_PMAC
         depends on PPC_MULTIPLATFORM
         bool "  Apple G5 based machines"
@@ -106,6 +110,21 @@ config PPC_OF
         bool
         default y
 
+config XICS
+        depends on PPC_PSERIES
+        bool
+        default y
+
+config MPIC
+        depends on PPC_PSERIES || PPC_PMAC || PPC_MAPLE
+        bool
+        default y
+
+config BPA_IIC
+        depends on PPC_BPA
+        bool
+        default y
+
 # VMX is pSeries only for now until somebody writes the iSeries
 # exception vectors for it
 config ALTIVEC
@@ -198,13 +217,49 @@ config HMT
           This option enables hardware multithreading on RS64 cpus.
           pSeries systems p620 and p660 have such a cpu type.
 
-config DISCONTIGMEM
-        bool "Discontiguous Memory Support"
+config ARCH_SELECT_MEMORY_MODEL
+        def_bool y
+
+config ARCH_FLATMEM_ENABLE
+       def_bool y
+       depends on !NUMA
+
+config ARCH_DISCONTIGMEM_ENABLE
+        def_bool y
         depends on SMP && PPC_PSERIES
 
+config ARCH_DISCONTIGMEM_DEFAULT
+        def_bool y
+        depends on ARCH_DISCONTIGMEM_ENABLE
+
+config ARCH_FLATMEM_ENABLE
+        def_bool y
+
+config ARCH_SPARSEMEM_ENABLE
+        def_bool y
+        depends on ARCH_DISCONTIGMEM_ENABLE
+
+source "mm/Kconfig"
+
+config HAVE_ARCH_EARLY_PFN_TO_NID
+        def_bool y
+        depends on NEED_MULTIPLE_NODES
+
+# Some NUMA nodes have memory ranges that span
+# other nodes.  Even though a pfn is valid and
+# between a node's start and end pfns, it may not
+# reside on that node.
+#
+# This is a relatively temporary hack that should
+# be able to go away when sparsemem is fully in
+# place
+config NODES_SPAN_OTHER_NODES
+        def_bool y
+        depends on NEED_MULTIPLE_NODES
+
 config NUMA
         bool "NUMA support"
-        depends on DISCONTIGMEM
+        default y if DISCONTIGMEM || SPARSEMEM
 
 config SCHED_SMT
         bool "SMT (Hyperthreading) scheduler support"
@@ -256,7 +311,7 @@ config MSCHUNKS
 
 config PPC_RTAS
         bool
-        depends on PPC_PSERIES
+        depends on PPC_PSERIES || PPC_BPA
         default y
 
 config RTAS_PROC