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

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

powerpc: Remove CLASSIC_PPC 



We have a strange #define in cputable.h called CLASSIC_PPC.

Although it is defined for 32 & 64bit, it's only used for 32bit and
it's basically a duplicate of CONFIG_PPC_BOOK3S_32, so let's use
the latter.

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

arch/powerpc/include/asm/cputable.h

+2 −5
Original line number Diff line number Diff line
@@ -267,9 +267,6 @@ extern const char *powerpc_base_platform; 
#define CPU_FTR_MAYBE_CAN_NAP	0

#endif



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

		     !defined(CONFIG_BOOKE))



#define CPU_FTRS_PPC601	(CPU_FTR_COMMON | CPU_FTR_601 | \

	CPU_FTR_COHERENT_ICACHE | CPU_FTR_UNIFIED_ID_CACHE)

#define CPU_FTRS_603	(CPU_FTR_COMMON | \
@@ -467,7 +464,7 @@ extern const char *powerpc_base_platform; 
#else

enum {

	CPU_FTRS_POSSIBLE =

#if CLASSIC_PPC

#ifdef CONFIG_PPC_BOOK3S_32

	    CPU_FTRS_PPC601 | CPU_FTRS_603 | CPU_FTRS_604 | CPU_FTRS_740_NOTAU |

	    CPU_FTRS_740 | CPU_FTRS_750 | CPU_FTRS_750FX1 |

	    CPU_FTRS_750FX2 | CPU_FTRS_750FX | CPU_FTRS_750GX |
@@ -517,7 +514,7 @@ enum { 
#else

enum {

	CPU_FTRS_ALWAYS =

#if CLASSIC_PPC

#ifdef CONFIG_PPC_BOOK3S_32

	    CPU_FTRS_PPC601 & CPU_FTRS_603 & CPU_FTRS_604 & CPU_FTRS_740_NOTAU &

	    CPU_FTRS_740 & CPU_FTRS_750 & CPU_FTRS_750FX1 &

	    CPU_FTRS_750FX2 & CPU_FTRS_750FX & CPU_FTRS_750GX &

arch/powerpc/kernel/cputable.c

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



#ifdef CONFIG_PPC32

#if CLASSIC_PPC

#ifdef CONFIG_PPC_BOOK3S_32

	{	/* 601 */

		.pvr_mask		= 0xffff0000,

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

		.platform		= "ppc603",

	},

#endif /* CLASSIC_PPC */

#endif /* CONFIG_PPC_BOOK3S_32 */

#ifdef CONFIG_8xx

	{	/* 8xx */

		.pvr_mask		= 0xffff0000,