Skip to content

Commit

Permalink
powerpc/82xx: Remove CONFIG_8260 and CONFIG_8272
Browse files Browse the repository at this point in the history
CONFIG_8272 is never used, remove it.

CONFIG_8260 is redundant with CONFIG_PPC_82xx, remove it.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/80930252a5167f3cdaa7eb694074d75521a0bdf9.1692259495.git.christophe.leroy@csgroup.eu
  • Loading branch information
Christophe Leroy authored and Michael Ellerman committed Aug 18, 2023
1 parent 188da8a commit eb5aa21
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 23 deletions.
2 changes: 1 addition & 1 deletion arch/powerpc/include/asm/cputable.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
25 changes: 4 additions & 21 deletions arch/powerpc/platforms/82xx/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion arch/powerpc/platforms/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit eb5aa21

Please sign in to comment.