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

powerpc: Change CONFIG_E500 to CONFIG_PPC_E500 



It will be used outside arch/powerpc, make it clear its a
powerpc configuration item.

And we already have CONFIG_PPC_E500MC, so that will make
it more consistent.

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/e63b22083c11c4300f4a82d3123a46e5fdd54fa6.1663606876.git.christophe.leroy@csgroup.eu
parent 1df39901

arch/powerpc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ KBUILD_CFLAGS += $(call cc-option,-mno-string) 
cpu-as-$(CONFIG_40x)		+= -Wa,-m405

cpu-as-$(CONFIG_44x)		+= -Wa,-m440

cpu-as-$(CONFIG_ALTIVEC)	+= $(call as-option,-Wa$(comma)-maltivec)

cpu-as-$(CONFIG_E500)		+= -Wa,-me500

cpu-as-$(CONFIG_PPC_E500)		+= -Wa,-me500



# When using '-many -mpower4' gas will first try and find a matching power4

# mnemonic and failing that it will allow any valid mnemonic that GAS knows

arch/powerpc/include/asm/cputable.h

+2 −2
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ enum { 
#elif defined(CONFIG_44x)

	    CPU_FTRS_44X | CPU_FTRS_440x6 |

#endif

#ifdef CONFIG_E500

#ifdef CONFIG_PPC_E500

	    CPU_FTRS_E500 | CPU_FTRS_E500_2 |

#endif

#ifdef CONFIG_PPC_E500MC
@@ -584,7 +584,7 @@ enum { 
#elif defined(CONFIG_44x)

	    CPU_FTRS_44X & CPU_FTRS_440x6 &

#endif

#ifdef CONFIG_E500

#ifdef CONFIG_PPC_E500

	    CPU_FTRS_E500 & CPU_FTRS_E500_2 &

#endif

#ifdef CONFIG_PPC_E500MC

arch/powerpc/include/asm/kgdb.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static inline void arch_kgdb_breakpoint(void) 
/* On non-E500 family PPC32 we determine the size by picking the last

 * register we need, but on E500 we skip sections so we list what we

 * need to store, and add it up. */

#ifndef CONFIG_E500

#ifndef CONFIG_PPC_E500

#define MAXREG			(PT_FPSCR+1)

#else

/* 32 GPRs (8 bytes), nip, msr, ccr, link, ctr, xer, acc (8 bytes), spefscr*/

arch/powerpc/include/asm/mmu.h

+2 −2
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ enum { 
#elif defined(CONFIG_44x)

		MMU_FTR_TYPE_44x |

#endif

#ifdef CONFIG_E500

#ifdef CONFIG_PPC_E500

		MMU_FTR_TYPE_FSL_E | MMU_FTR_BIG_PHYS | MMU_FTR_USE_TLBILX |

#endif

#ifdef CONFIG_PPC_BOOK3S_32
@@ -211,7 +211,7 @@ enum { 
#elif defined(CONFIG_44x)

#define MMU_FTRS_ALWAYS		MMU_FTR_TYPE_44x

#endif

#ifdef CONFIG_E500

#ifdef CONFIG_PPC_E500

#define MMU_FTRS_ALWAYS		MMU_FTR_TYPE_FSL_E

#endif

arch/powerpc/include/asm/reg_booke.h

+3 −3
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ 
#define PPC47x_MCSR_FPR	0x00800000 /* FPR parity error */

#define PPC47x_MCSR_IPR	0x00400000 /* Imprecise Machine Check Exception */



#ifdef CONFIG_E500

#ifdef CONFIG_PPC_E500

/* All e500 */

#define MCSR_MCP 	0x80000000UL /* Machine Check Input Pin */

#define MCSR_ICPERR 	0x40000000UL /* I-Cache Parity Error */
@@ -282,7 +282,7 @@ 
#endif



/* Bit definitions for the HID1 */

#ifdef CONFIG_E500

#ifdef CONFIG_PPC_E500

/* e500v1/v2 */

#define HID1_PLL_CFG_MASK 0xfc000000	/* PLL_CFG input pins */

#define HID1_RFXE	0x00020000	/* Read fault exception enable */
@@ -545,7 +545,7 @@ 
#define TCR_FIE		0x00800000	/* FIT Interrupt Enable */

#define TCR_ARE		0x00400000	/* Auto Reload Enable */



#ifdef CONFIG_E500

#ifdef CONFIG_PPC_E500

#define TCR_GET_WP(tcr)  ((((tcr) & 0xC0000000) >> 30) | \

			      (((tcr) & 0x1E0000) >> 15))

#else