Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3993f10 authored by Michael Ellerman's avatar Michael Ellerman Committed by Benjamin Herrenschmidt
Browse files

powerpc: Remove CONFIG_POWER3 



Now that we have dropped power3 support we can remove CONFIG_POWER3. The
usage in pgtable_32.c was already dead code as CONFIG_POWER3 was not
selectable on PPC32.

Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent cec15488

arch/powerpc/include/asm/cputable.h

+1 −2
Original line number Diff line number Diff line
@@ -268,8 +268,7 @@ extern const char *powerpc_base_platform; 
#endif



#define CLASSIC_PPC (!defined(CONFIG_8xx) && !defined(CONFIG_4xx) && \

		     !defined(CONFIG_POWER3) && !defined(CONFIG_POWER4) && \

		     !defined(CONFIG_BOOKE))

		     !defined(CONFIG_POWER4) && !defined(CONFIG_BOOKE))



#define CPU_FTRS_PPC601	(CPU_FTR_COMMON | CPU_FTR_601 | \

	CPU_FTR_COHERENT_ICACHE | CPU_FTR_UNIFIED_ID_CACHE)

arch/powerpc/mm/pgtable_32.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ unsigned long ioremap_base; 
unsigned long ioremap_bot;

EXPORT_SYMBOL(ioremap_bot);	/* aka VMALLOC_END */



#if defined(CONFIG_6xx) || defined(CONFIG_POWER3)

#ifdef CONFIG_6xx

#define HAVE_BATS	1

#endif

arch/powerpc/platforms/Kconfig.cputype

+0 −4
Original line number Diff line number Diff line
@@ -140,10 +140,6 @@ config 6xx 
	depends on PPC32 && PPC_BOOK3S

	select PPC_HAVE_PMU_SUPPORT



config POWER3

	depends on PPC64 && PPC_BOOK3S

	def_bool y



config POWER4

	depends on PPC64 && PPC_BOOK3S

	def_bool y