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

powerpc/82xx: Remove CONFIG_8260 and CONFIG_8272 



CONFIG_8272 is never used, remove it.

CONFIG_8260 is redundant with CONFIG_PPC_82xx, remove it.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/80930252a5167f3cdaa7eb694074d75521a0bdf9.1692259495.git.christophe.leroy@csgroup.eu
parent 188da8af

arch/powerpc/include/asm/cputable.h

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ static inline void cpu_feature_keys_init(void) { } 
 * This is also required by 52xx family.

 */

#if defined(CONFIG_SMP) || defined(CONFIG_MPC10X_BRIDGE) \

	|| defined(CONFIG_PPC_83xx) || defined(CONFIG_8260) \

	|| defined(CONFIG_PPC_83xx) || defined(CONFIG_PPC_82xx) \

	|| defined(CONFIG_PPC_MPC52xx)

#define CPU_FTR_COMMON                  CPU_FTR_NEED_COHERENT

#else

arch/powerpc/platforms/82xx/Kconfig

+4 −21
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ if PPC_82xx 


config EP8248E

	bool "Embedded Planet EP8248E (a.k.a. CWH-PPC-8248N-VE)"

	select 8272

	select 8260

	select CPM2

	select PPC_INDIRECT_PCI if PCI

	select FSL_SOC

	select PHYLIB if NETDEVICES

	select MDIO_BITBANG if PHYLIB
@@ -20,27 +20,10 @@ config EP8248E 


config MGCOGE

	bool "Keymile MGCOGE"

	select 8272

	select 8260

	select CPM2

	select PPC_INDIRECT_PCI if PCI

	select FSL_SOC

	help

	  This enables support for the Keymile MGCOGE board.



endif
 


config 8260

	bool

	depends on PPC_BOOK3S_32

	select CPM2

	select PPC_INDIRECT_PCI if PCI

	help

	  The MPC8260 is a typical embedded CPU made by Freescale.  Selecting

	  this option means that you wish to build a kernel for a machine with

	  an 8260 class CPU.



config 8272

	bool

	select 8260

	help

	  The MPC8272 CPM has a different internal dpram setup than other CPM2

	  devices

arch/powerpc/platforms/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ config QE_GPIO 


config CPM2

	bool "Enable support for the CPM2 (Communications Processor Module)"

	depends on (FSL_SOC_BOOKE && PPC32) || 8260

	depends on (FSL_SOC_BOOKE && PPC32) || PPC_82xx

	select CPM

	select HAVE_PCI

	select GPIOLIB