1 files changed, 19 insertions, 0 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 587da5e0990f..380baa1780e9 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -22,6 +22,9 @@ config WORD_SIZE
 config PPC_MERGE
         def_bool y
 
+config ARCH_PHYS_ADDR_T_64BIT
+       def_bool PPC64 || PHYS_64BIT
+
 config MMU
         bool
         default y
@@ -415,8 +418,11 @@ config PPC_64K_PAGES
 
 config FORCE_MAX_ZONEORDER
         int "Maximum zone order"
+        range 9 64 if PPC_64K_PAGES
         default "9" if PPC_64K_PAGES
+        range 13 64 if PPC64 && !PPC_64K_PAGES
         default "13" if PPC64 && !PPC_64K_PAGES
+        range 11 64
         default "11"
         help
           The kernel memory allocator divides physically contiguous memory
@@ -806,6 +812,19 @@ config PIN_TLB
 endmenu
 
 if PPC64
+config RELOCATABLE
+        bool "Build a relocatable kernel"
+        help
+          This builds a kernel image that is capable of running anywhere
+          in the RMA (real memory area) at any 16k-aligned base address.
+          The kernel is linked as a position-independent executable (PIE)
+          and contains dynamic relocations which are processed early
+          in the bootup process.
+
+          One use is for the kexec on panic case where the recovery kernel
+          must live at a different physical address than the primary
+          kernel.
+
 config PAGE_OFFSET
         hex
         default "0xc000000000000000"