tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: 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

authored by

Christophe Leroy and committed by
Michael Ellerman eb5aa213 188da8af

+6 -23
+1 -1
arch/powerpc/include/asm/cputable.h
··· 252 252 * This is also required by 52xx family. 253 253 */ 254 254 #if defined(CONFIG_SMP) || defined(CONFIG_MPC10X_BRIDGE) \ 255 - || defined(CONFIG_PPC_83xx) || defined(CONFIG_8260) \ 255 + || defined(CONFIG_PPC_83xx) || defined(CONFIG_PPC_82xx) \ 256 256 || defined(CONFIG_PPC_MPC52xx) 257 257 #define CPU_FTR_COMMON CPU_FTR_NEED_COHERENT 258 258 #else
+4 -21
arch/powerpc/platforms/82xx/Kconfig
··· 7 7 8 8 config EP8248E 9 9 bool "Embedded Planet EP8248E (a.k.a. CWH-PPC-8248N-VE)" 10 - select 8272 11 - select 8260 10 + select CPM2 11 + select PPC_INDIRECT_PCI if PCI 12 12 select FSL_SOC 13 13 select PHYLIB if NETDEVICES 14 14 select MDIO_BITBANG if PHYLIB ··· 20 20 21 21 config MGCOGE 22 22 bool "Keymile MGCOGE" 23 - select 8272 24 - select 8260 23 + select CPM2 24 + select PPC_INDIRECT_PCI if PCI 25 25 select FSL_SOC 26 26 help 27 27 This enables support for the Keymile MGCOGE board. 28 28 29 29 endif 30 - 31 - config 8260 32 - bool 33 - depends on PPC_BOOK3S_32 34 - select CPM2 35 - select PPC_INDIRECT_PCI if PCI 36 - help 37 - The MPC8260 is a typical embedded CPU made by Freescale. Selecting 38 - this option means that you wish to build a kernel for a machine with 39 - an 8260 class CPU. 40 - 41 - config 8272 42 - bool 43 - select 8260 44 - help 45 - The MPC8272 CPM has a different internal dpram setup than other CPM2 46 - devices
+1 -1
arch/powerpc/platforms/Kconfig
··· 251 251 252 252 config CPM2 253 253 bool "Enable support for the CPM2 (Communications Processor Module)" 254 - depends on (FSL_SOC_BOOKE && PPC32) || 8260 254 + depends on (FSL_SOC_BOOKE && PPC32) || PPC_82xx 255 255 select CPM 256 256 select HAVE_PCI 257 257 select GPIOLIB