powerpc: Remove PowerPC 601

Powerpc 601 is 25 years old.

It is not selected by any defconfig.

It requires a lot of special handling as it deviates from the
standard 6xx.

Retire it.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/00a6948d659e017f8ca63437d1384222c3aede57.1601362098.git.christophe.leroy@csgroup.eu

diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index b5bc2ed..492c0b3 100644 (file)
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -609,21 +609,6 @@ static struct cpu_spec __initdata cpu_specs[] = {
 #endif /* CONFIG_PPC_BOOK3S_64 */
 
 #ifdef CONFIG_PPC32
-#ifdef CONFIG_PPC_BOOK3S_601
-       {       /* 601 */
-               .pvr_mask               = 0xffff0000,
-               .pvr_value              = 0x00010000,
-               .cpu_name               = "601",
-               .cpu_features           = CPU_FTRS_PPC601,
-               .cpu_user_features      = COMMON_USER | PPC_FEATURE_601_INSTR |
-                       PPC_FEATURE_UNIFIED_CACHE | PPC_FEATURE_NO_TB,
-               .mmu_features           = MMU_FTR_HPTE_TABLE,
-               .icache_bsize           = 32,
-               .dcache_bsize           = 32,
-               .machine_check          = machine_check_generic,
-               .platform               = "ppc601",
-       },
-#endif /* CONFIG_PPC_BOOK3S_601 */
 #ifdef CONFIG_PPC_BOOK3S_6xx
        {       /* 603 */
                .pvr_mask               = 0xffff0000,

diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index e74ec22..c194c4a 100644 (file)
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -20,7 +20,7 @@ choice
        depends on PPC32
        help
          There are five families of 32 bit PowerPC chips supported.
-         The most common ones are the desktop and server CPUs (601, 603,
+         The most common ones are the desktop and server CPUs (603,
          604, 740, 750, 74xx) CPUs from Freescale and IBM, with their
          embedded 512x/52xx/82xx/83xx/86xx counterparts.
          The other embedded parts, namely 4xx, 8xx, e200 (55xx) and e500
@@ -30,7 +30,7 @@ choice
          If unsure, select 52xx/6xx/7xx/74xx/82xx/83xx/86xx.
 
 config PPC_BOOK3S_6xx
-       bool "512x/52xx/6xx/7xx/74xx/82xx/83xx/86xx except 601"
+       bool "512x/52xx/6xx/7xx/74xx/82xx/83xx/86xx"
        select PPC_BOOK3S_32
        select PPC_FPU
        select PPC_HAVE_PMU_SUPPORT
@@ -38,13 +38,6 @@ config PPC_BOOK3S_6xx
        select PPC_HAVE_KUAP
        select HAVE_ARCH_VMAP_STACK if !ADB_PMU
 
-config PPC_BOOK3S_601
-       bool "PowerPC 601"
-       select PPC_BOOK3S_32
-       select PPC_FPU
-       select PPC_HAVE_KUAP
-       select HAVE_ARCH_VMAP_STACK
-
 config PPC_85xx
        bool "Freescale 85xx"
        select E500