Commit 4c91bd6e authored by Kevin Hao's avatar Kevin Hao Committed by Michael Ellerman
Browse files

powerpc: Merge the RELOCATABLE config entries for ppc32 and ppc64 



It makes no sense to keep two separate RELOCATABLE config entries for
ppc32 and ppc64 respectively. Merge them into one and move it to a
common place.

Signed-off-by: default avatarKevin Hao <haokexin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent da423071

arch/powerpc/Kconfig

+27 −38
Original line number Diff line number Diff line
@@ -458,6 +458,33 @@ config KEXEC 
	  interface is strongly in flux, so no good recommendation can be

	  made.



config RELOCATABLE

	bool "Build a relocatable kernel"

	depends on (PPC64 && !COMPILE_TEST) || (FLATMEM && (44x || FSL_BOOKE))

	select NONSTATIC_KERNEL

	help

	  This builds a kernel image that is capable of running at the

	  location the kernel is loaded at. For ppc32, there is no any

	  alignment restrictions, and this feature is a superset of

	  DYNAMIC_MEMSTART and hence overrides it. For ppc64, we should use

	  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.



	  Note: If CONFIG_RELOCATABLE=y, then the kernel runs from the address

	  it has been loaded at and the compile time physical addresses

	  CONFIG_PHYSICAL_START is ignored.  However CONFIG_PHYSICAL_START

	  setting can still be useful to bootwrappers that need to know the

	  load address of the kernel (eg. u-boot/mkimage).



config RELOCATABLE_PPC32

	def_bool y

	depends on PPC32 && RELOCATABLE



config CRASH_DUMP

	bool "Build a kdump crash kernel"

	depends on PPC64 || 6xx || FSL_BOOKE || (44x && !SMP)
@@ -950,29 +977,6 @@ config DYNAMIC_MEMSTART 


	  This option is overridden by CONFIG_RELOCATABLE



config RELOCATABLE

	bool "Build a relocatable kernel"

	depends on FLATMEM && (44x || FSL_BOOKE)

	select NONSTATIC_KERNEL

	help

	  This builds a kernel image that is capable of running at the

	  location the kernel is loaded at, without any alignment restrictions.

	  This feature is a superset of DYNAMIC_MEMSTART and hence overrides it.



	  One use is for the kexec on panic case where the recovery kernel

	  must live at a different physical address than the primary

	  kernel.



	  Note: If CONFIG_RELOCATABLE=y, then the kernel runs from the address

	  it has been loaded at and the compile time physical addresses

	  CONFIG_PHYSICAL_START is ignored.  However CONFIG_PHYSICAL_START

	  setting can still be useful to bootwrappers that need to know the

	  load address of the kernel (eg. u-boot/mkimage).



config RELOCATABLE_PPC32

	def_bool y

	depends on PPC32 && RELOCATABLE



config PAGE_OFFSET_BOOL

	bool "Set custom page offset address"

	depends on ADVANCED_OPTIONS
@@ -1058,21 +1062,6 @@ config PIN_TLB 
endmenu



if PPC64

config RELOCATABLE

	bool "Build a relocatable kernel"

	depends on !COMPILE_TEST

	select NONSTATIC_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.



# This value must have zeroes in the bottom 60 bits otherwise lots will break

config PAGE_OFFSET

	hex