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

diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h
index 443a9d482b1524f6b9ee815284e5a76d41b95b96..8765d5158324e510c253505a1fd9aa9fe392199b 100644 (file)
--- a/arch/powerpc/include/asm/cputable.h
+++ b/arch/powerpc/include/asm/cputable.h
@@ -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

diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig
index 58e58b4f6a12ed6a0f9d6dab868f517f70bd73b0..d9f1a2a83158aa47b6763e6fe7180617096ac73f 100644 (file)
--- a/arch/powerpc/platforms/82xx/Kconfig
+++ b/arch/powerpc/platforms/82xx/Kconfig
@@ -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

diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 3e2e252016f7a6e66de2e85a5c6bb548a36c1688..1fd253f92a77493de18449aea0012be0eb118d07 100644 (file)
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -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