Commit dfc3095c authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc: Remove CONFIG_FSL_BOOKE 



PPC_85xx is PPC32 only.
PPC_85xx always selects E500 and is the only PPC32 that
selects E500.
FSL_BOOKE is selected when E500 and PPC32 are selected.

So FSL_BOOKE is redundant with PPC_85xx.

Remove FSL_BOOKE.

And rename four files accordingly.

cpu_setup_fsl_booke.S is not renamed because it is linked to
PPC_FSL_BOOK3E and not to FSL_BOOKE as suggested by its name.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/08e3e15594e66d63b9e89c5b4f9c35153913c28f.1663606875.git.christophe.leroy@csgroup.eu
parent e320a76d

arch/powerpc/Kconfig

+14 −14
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ config PPC 
	select ARCH_HAS_SCALED_CPUTIME		if VIRT_CPU_ACCOUNTING_NATIVE && PPC_BOOK3S_64

	select ARCH_HAS_SET_MEMORY

	select ARCH_HAS_STRICT_KERNEL_RWX	if (PPC_BOOK3S || PPC_8xx || 40x) && !HIBERNATION

	select ARCH_HAS_STRICT_KERNEL_RWX	if FSL_BOOKE && !HIBERNATION && !RANDOMIZE_BASE

	select ARCH_HAS_STRICT_KERNEL_RWX	if PPC_85xx && !HIBERNATION && !RANDOMIZE_BASE

	select ARCH_HAS_STRICT_MODULE_RWX	if ARCH_HAS_STRICT_KERNEL_RWX

	select ARCH_HAS_TICK_BROADCAST		if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_HAS_UACCESS_FLUSHCACHE
@@ -548,7 +548,7 @@ config PPC64_SUPPORTS_MEMORY_FAILURE 


config KEXEC

	bool "kexec system call"

	depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP)) || PPC_BOOK3E

	depends on (PPC_BOOK3S || PPC_85xx || (44x && !SMP)) || PPC_BOOK3E

	select KEXEC_CORE

	help

	  kexec is a system call that implements the ability to shutdown your
@@ -583,7 +583,7 @@ config ARCH_HAS_KEXEC_PURGATORY 


config RELOCATABLE

	bool "Build a relocatable kernel"

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

	depends on PPC64 || (FLATMEM && (44x || PPC_85xx))

	select NONSTATIC_KERNEL

	help

	  This builds a kernel image that is capable of running at the
@@ -606,7 +606,7 @@ config RELOCATABLE 


config RANDOMIZE_BASE

	bool "Randomize the address of the kernel image"

	depends on (FSL_BOOKE && FLATMEM && PPC32)

	depends on (PPC_85xx && FLATMEM && PPC32)

	depends on RELOCATABLE

	help

	  Randomizes the virtual address at which the kernel image is
@@ -625,8 +625,8 @@ config RELOCATABLE_TEST 


config CRASH_DUMP

	bool "Build a dump capture kernel"

	depends on PPC64 || PPC_BOOK3S_32 || FSL_BOOKE || (44x && !SMP)

	select RELOCATABLE if PPC64 || 44x || FSL_BOOKE

	depends on PPC64 || PPC_BOOK3S_32 || PPC_85xx || (44x && !SMP)

	select RELOCATABLE if PPC64 || 44x || PPC_85xx

	help

	  Build a kernel suitable for use as a dump capture kernel.

	  The same kernel binary can be used as production kernel and dump
@@ -815,7 +815,7 @@ config DATA_SHIFT_BOOL 
	depends on ADVANCED_OPTIONS

	depends on STRICT_KERNEL_RWX || DEBUG_PAGEALLOC || KFENCE

	depends on PPC_BOOK3S_32 || (PPC_8xx && !PIN_TLB_DATA && !STRICT_KERNEL_RWX) || \

		   FSL_BOOKE

		   PPC_85xx

	help

	  This option allows you to set the kernel data alignment. When

	  RAM is mapped by blocks, the alignment needs to fit the size and
@@ -828,13 +828,13 @@ config DATA_SHIFT 
	default 24 if STRICT_KERNEL_RWX && PPC64

	range 17 28 if (STRICT_KERNEL_RWX || DEBUG_PAGEALLOC || KFENCE) && PPC_BOOK3S_32

	range 19 23 if (STRICT_KERNEL_RWX || DEBUG_PAGEALLOC || KFENCE) && PPC_8xx

	range 20 24 if (STRICT_KERNEL_RWX || DEBUG_PAGEALLOC || KFENCE) && FSL_BOOKE

	range 20 24 if (STRICT_KERNEL_RWX || DEBUG_PAGEALLOC || KFENCE) && PPC_85xx

	default 22 if STRICT_KERNEL_RWX && PPC_BOOK3S_32

	default 18 if (DEBUG_PAGEALLOC || KFENCE) && PPC_BOOK3S_32

	default 23 if STRICT_KERNEL_RWX && PPC_8xx

	default 23 if (DEBUG_PAGEALLOC || KFENCE) && PPC_8xx && PIN_TLB_DATA

	default 19 if (DEBUG_PAGEALLOC || KFENCE) && PPC_8xx

	default 24 if STRICT_KERNEL_RWX && FSL_BOOKE

	default 24 if STRICT_KERNEL_RWX && PPC_85xx

	default PPC_PAGE_SHIFT

	help

	  On Book3S 32 (603+), DBATs are used to map kernel text and rodata RO.
@@ -1150,7 +1150,7 @@ config LOWMEM_SIZE 


config LOWMEM_CAM_NUM_BOOL

	bool "Set number of CAMs to use to map low memory"

	depends on ADVANCED_OPTIONS && FSL_BOOKE

	depends on ADVANCED_OPTIONS && PPC_85xx

	help

	  This option allows you to set the maximum number of CAM slots that

	  will be used to map low memory.  There are a limited number of slots
@@ -1161,7 +1161,7 @@ config LOWMEM_CAM_NUM_BOOL 
	  Say N here unless you know what you are doing.



config LOWMEM_CAM_NUM

	depends on FSL_BOOKE

	depends on PPC_85xx

	int "Number of CAMs to use to map low memory" if LOWMEM_CAM_NUM_BOOL

	default 3 if !STRICT_KERNEL_RWX

	default 9 if DATA_SHIFT >= 24
@@ -1170,7 +1170,7 @@ config LOWMEM_CAM_NUM 


config DYNAMIC_MEMSTART

	bool "Enable page aligned dynamic load address for kernel"

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

	depends on ADVANCED_OPTIONS && FLATMEM && (PPC_85xx || 44x)

	select NONSTATIC_KERNEL

	help

	  This option enables the kernel to be loaded at any page aligned
@@ -1219,7 +1219,7 @@ config KERNEL_START 


config PHYSICAL_START_BOOL

	bool "Set physical address where the kernel is loaded"

	depends on ADVANCED_OPTIONS && FLATMEM && FSL_BOOKE

	depends on ADVANCED_OPTIONS && FLATMEM && PPC_85xx

	help

	  This gives the physical address where the kernel is loaded.
@@ -1232,7 +1232,7 @@ config PHYSICAL_START 


config PHYSICAL_ALIGN

	hex

	default "0x04000000" if FSL_BOOKE

	default "0x04000000" if PPC_85xx

	help

	  This value puts the alignment restrictions on physical address

	  where kernel is loaded and run from. Kernel is compiled for an

arch/powerpc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ head-$(CONFIG_PPC_BOOK3S_32) := arch/powerpc/kernel/head_book3s_32.o 
head-$(CONFIG_PPC_8xx)		:= arch/powerpc/kernel/head_8xx.o

head-$(CONFIG_40x)		:= arch/powerpc/kernel/head_40x.o

head-$(CONFIG_44x)		:= arch/powerpc/kernel/head_44x.o

head-$(CONFIG_FSL_BOOKE)	:= arch/powerpc/kernel/head_fsl_booke.o

head-$(CONFIG_PPC_85xx)	:= arch/powerpc/kernel/head_85xx.o



head-$(CONFIG_PPC64)		+= arch/powerpc/kernel/entry_64.o

head-$(CONFIG_PPC_FPU)		+= arch/powerpc/kernel/fpu.o

arch/powerpc/include/asm/kexec.h

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#define _ASM_POWERPC_KEXEC_H

#ifdef __KERNEL__



#if defined(CONFIG_FSL_BOOKE) || defined(CONFIG_44x)

#if defined(CONFIG_PPC_85xx) || defined(CONFIG_44x)



/*

 * On FSL-BookE we setup a 1:1 mapping which covers the first 2GiB of memory

arch/powerpc/include/asm/nohash/32/pgtable.h

+3 −3
Original line number Diff line number Diff line
@@ -130,10 +130,10 @@ void unmap_kernel_page(unsigned long va); 
#include <asm/nohash/32/pte-40x.h>

#elif defined(CONFIG_44x)

#include <asm/nohash/32/pte-44x.h>

#elif defined(CONFIG_FSL_BOOKE) && defined(CONFIG_PTE_64BIT)

#elif defined(CONFIG_PPC_85xx) && defined(CONFIG_PTE_64BIT)

#include <asm/nohash/pte-book3e.h>

#elif defined(CONFIG_FSL_BOOKE)

#include <asm/nohash/32/pte-fsl-booke.h>

#elif defined(CONFIG_PPC_85xx)

#include <asm/nohash/32/pte-85xx.h>

#elif defined(CONFIG_PPC_8xx)

#include <asm/nohash/32/pte-8xx.h>

#endif

arch/powerpc/include/asm/nohash/32/pte-fsl-booke.h→arch/powerpc/include/asm/nohash/32/pte-85xx.h

+3 −3
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_POWERPC_NOHASH_32_PTE_FSL_BOOKE_H

#define _ASM_POWERPC_NOHASH_32_PTE_FSL_BOOKE_H

#ifndef _ASM_POWERPC_NOHASH_32_PTE_85xx_H

#define _ASM_POWERPC_NOHASH_32_PTE_85xx_H

#ifdef __KERNEL__



/* PTE bit definitions for Freescale BookE SW loaded TLB MMU based
@@ -71,4 +71,4 @@ 
#define PAGE_READONLY_X	__pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_EXEC)



#endif /* __KERNEL__ */

#endif /*  _ASM_POWERPC_NOHASH_32_PTE_FSL_BOOKE_H */
 
#endif /*  _ASM_POWERPC_NOHASH_32_PTE_FSL_85xx_H */