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

Commit 90029640 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc: Remove unused CPU_FTRS_A2 



In commit fb5a5157 "Remove platforms/wsp and associated pieces" we
removed the last user of CPU_FTRS_A2, so we should remove it too.

Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 66f3d4fe

arch/powerpc/include/asm/cputable.h

+2 −6
Original line number Original line Diff line number Diff line
@@ -448,13 +448,9 @@ extern const char *powerpc_base_platform; 
	    CPU_FTR_PURR | CPU_FTR_REAL_LE | CPU_FTR_DABRX)

	    CPU_FTR_PURR | CPU_FTR_REAL_LE | CPU_FTR_DABRX)

#define CPU_FTRS_COMPATIBLE	(CPU_FTR_USE_TB | CPU_FTR_PPCAS_ARCH_V2)

#define CPU_FTRS_COMPATIBLE	(CPU_FTR_USE_TB | CPU_FTR_PPCAS_ARCH_V2)





#define CPU_FTRS_A2 (CPU_FTR_USE_TB | CPU_FTR_SMT | CPU_FTR_DBELL | \

		     CPU_FTR_NOEXECUTE | CPU_FTR_NODSISRALIGN | \

		     CPU_FTR_ICSWX | CPU_FTR_DABRX )



#ifdef __powerpc64__

#ifdef __powerpc64__

#ifdef CONFIG_PPC_BOOK3E

#ifdef CONFIG_PPC_BOOK3E

#define CPU_FTRS_POSSIBLE	(CPU_FTRS_E6500 | CPU_FTRS_E5500 | CPU_FTRS_A2)

#define CPU_FTRS_POSSIBLE	(CPU_FTRS_E6500 | CPU_FTRS_E5500)

#else

#else

#define CPU_FTRS_POSSIBLE	\

#define CPU_FTRS_POSSIBLE	\

	    (CPU_FTRS_POWER4 | CPU_FTRS_PPC970 | CPU_FTRS_POWER5 | \

	    (CPU_FTRS_POWER4 | CPU_FTRS_PPC970 | CPU_FTRS_POWER5 | \
@@ -505,7 +501,7 @@ enum { 




#ifdef __powerpc64__

#ifdef __powerpc64__

#ifdef CONFIG_PPC_BOOK3E

#ifdef CONFIG_PPC_BOOK3E

#define CPU_FTRS_ALWAYS		(CPU_FTRS_E6500 & CPU_FTRS_E5500 & CPU_FTRS_A2)

#define CPU_FTRS_ALWAYS		(CPU_FTRS_E6500 & CPU_FTRS_E5500)

#else

#else

#define CPU_FTRS_ALWAYS		\

#define CPU_FTRS_ALWAYS		\

	    (CPU_FTRS_POWER4 & CPU_FTRS_PPC970 & CPU_FTRS_POWER5 & \

	    (CPU_FTRS_POWER4 & CPU_FTRS_PPC970 & CPU_FTRS_POWER5 & \