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

powerpc/32s: Remove CONFIG_PPC_BOOK3S_6xx 



As 601 is gone, CONFIG_PPC_BOO3S_6xx and CONFIG_PPC_BOOK3S_32
are dedundant.

Remove CONFIG_PPC_BOOK3S_6xx.

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/f18c16af37f6f77b577bed8d9e12831b695617ae.1603348103.git.christophe.leroy@csgroup.eu
parent 068fdba1

arch/powerpc/kernel/cputable.c

+2 −2
Original line number Diff line number Diff line
@@ -611,7 +611,7 @@ static struct cpu_spec __initdata cpu_specs[] = { 
#endif	/* CONFIG_PPC_BOOK3S_64 */



#ifdef CONFIG_PPC32

#ifdef CONFIG_PPC_BOOK3S_6xx

#ifdef CONFIG_PPC_BOOK3S_32

	{	/* 603 */

		.pvr_mask		= 0xffff0000,

		.pvr_value		= 0x00030000,
@@ -1241,7 +1241,7 @@ static struct cpu_spec __initdata cpu_specs[] = { 
		.machine_check		= machine_check_generic,

		.platform		= "ppc603",

	},

#endif /* CONFIG_PPC_BOOK3S_6xx */

#endif /* CONFIG_PPC_BOOK3S_32 */

#ifdef CONFIG_PPC_8xx

	{	/* 8xx */

		.pvr_mask		= 0xffff0000,

arch/powerpc/platforms/Kconfig.cputype

+1 −5
Original line number Diff line number Diff line
@@ -11,9 +11,6 @@ config PPC64 
	  This option selects whether a 32-bit or a 64-bit kernel

	  will be built.



config PPC_BOOK3S_32

	bool



menu "Processor support"

choice

	prompt "Processor Type"
@@ -29,9 +26,8 @@ choice 


	  If unsure, select 52xx/6xx/7xx/74xx/82xx/83xx/86xx.



config PPC_BOOK3S_6xx

config PPC_BOOK3S_32

	bool "512x/52xx/6xx/7xx/74xx/82xx/83xx/86xx"

	select PPC_BOOK3S_32

	imply PPC_FPU

	select PPC_HAVE_PMU_SUPPORT

	select PPC_HAVE_KUEP