Commit 27d11496 authored by Kevin Hao's avatar Kevin Hao Committed by Michael Ellerman
Browse files

powerpc/32: Remove RELOCATABLE_PPC32 



It is seldom used in the kernel code and can be easily replaced by
either RELOCATABLE or PPC32. So there is no reason to keep a separate
kernel option for this.

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

arch/powerpc/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -481,10 +481,6 @@ config RELOCATABLE 
	  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)

arch/powerpc/include/asm/page.h

+3 −3
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ extern unsigned int HPAGE_SHIFT; 
extern phys_addr_t memstart_addr;

extern phys_addr_t kernstart_addr;



#ifdef CONFIG_RELOCATABLE_PPC32

#if defined(CONFIG_RELOCATABLE) && defined(CONFIG_PPC32)

extern long long virt_phys_offset;

#endif
@@ -139,9 +139,9 @@ extern long long virt_phys_offset; 
 * determine MEMORY_START until then.  However we can determine PHYSICAL_START

 * from information at hand (program counter, TLB lookup).

 *

 * On BookE with RELOCATABLE (RELOCATABLE_PPC32)

 * On BookE with RELOCATABLE && PPC32

 *

 *   With RELOCATABLE_PPC32,  we support loading the kernel at any physical 

 *   With RELOCATABLE && PPC32,  we support loading the kernel at any physical

 *   address without any restriction on the page alignment.

 *

 *   We find the runtime address of _stext and relocate ourselves based on

arch/powerpc/kernel/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o 
obj-$(CONFIG_PPC_BOOK3S_64)	+= cpu_setup_ppc970.o cpu_setup_pa6t.o

obj-$(CONFIG_PPC_BOOK3S_64)	+= cpu_setup_power.o

obj-$(CONFIG_PPC_BOOK3S_64)	+= mce.o mce_power.o

obj64-$(CONFIG_RELOCATABLE)	+= reloc_64.o

obj-$(CONFIG_PPC_BOOK3E_64)	+= exceptions-64e.o idle_book3e.o

obj-$(CONFIG_PPC64)		+= vdso64/

obj-$(CONFIG_ALTIVEC)		+= vecemu.o
@@ -87,7 +86,7 @@ extra-$(CONFIG_FSL_BOOKE) := head_fsl_booke.o 
extra-$(CONFIG_8xx)		:= head_8xx.o

extra-y				+= vmlinux.lds



obj-$(CONFIG_RELOCATABLE_PPC32)	+= reloc_32.o

obj-$(CONFIG_RELOCATABLE)	+= reloc_$(CONFIG_WORD_SIZE).o



obj-$(CONFIG_PPC32)		+= entry_32.o setup_32.o

obj-$(CONFIG_PPC64)		+= dma-iommu.o iommu.o

arch/powerpc/kernel/vmlinux.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ SECTIONS 
	. = ALIGN(8);

	.dynsym : AT(ADDR(.dynsym) - LOAD_OFFSET)

	{

#ifdef CONFIG_RELOCATABLE_PPC32

#ifdef CONFIG_PPC32

		__dynamic_symtab = .;

#endif

		*(.dynsym)

arch/powerpc/mm/init_32.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ EXPORT_SYMBOL(memstart_addr); 
phys_addr_t kernstart_addr;

EXPORT_SYMBOL(kernstart_addr);



#ifdef CONFIG_RELOCATABLE_PPC32

#ifdef CONFIG_RELOCATABLE

/* Used in __va()/__pa() */

long long virt_phys_offset;

EXPORT_SYMBOL(virt_phys_offset);