powerpc/kconfig: remove CONFIG_6xx

CONFIG_6xx is not used anymore. Remove it.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 8be3126..ac9703e 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -556,7 +556,7 @@ config RELOCATABLE_TEST
 
 config CRASH_DUMP
        bool "Build a dump capture kernel"
-       depends on PPC64 || 6xx || FSL_BOOKE || (44x && !SMP)
+       depends on PPC64 || PPC_BOOK3S_32 || FSL_BOOKE || (44x && !SMP)
        select RELOCATABLE if PPC64 || 44x || FSL_BOOKE
        help
          Build a kernel suitable for use as a dump capture kernel.

diff --git a/arch/powerpc/platforms/512x/Kconfig b/arch/powerpc/platforms/512x/Kconfig
index b59eab6..0c49582 100644 (file)
--- a/arch/powerpc/platforms/512x/Kconfig
+++ b/arch/powerpc/platforms/512x/Kconfig
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 config PPC_MPC512x
        bool "512x-based boards"
-       depends on 6xx
+       depends on PPC_BOOK3S_32
        select COMMON_CLK
        select FSL_SOC
        select IPIC

diff --git a/arch/powerpc/platforms/52xx/Kconfig b/arch/powerpc/platforms/52xx/Kconfig
index 55a5870..67f8c2d 100644 (file)
--- a/arch/powerpc/platforms/52xx/Kconfig
+++ b/arch/powerpc/platforms/52xx/Kconfig
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 config PPC_MPC52xx
        bool "52xx-based boards"
-       depends on 6xx
+       depends on PPC_BOOK3S_32
        select COMMON_CLK
        select PPC_PCI_CHOICE
 

diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig
index 1947a88..1af81de 100644 (file)
--- a/arch/powerpc/platforms/82xx/Kconfig
+++ b/arch/powerpc/platforms/82xx/Kconfig
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 menuconfig PPC_82xx
        bool "82xx-based boards (PQ II)"
-       depends on 6xx
+       depends on PPC_BOOK3S_32
 
 if PPC_82xx
 
@@ -54,7 +54,7 @@ config PQ2ADS
 
 config 8260
        bool
-       depends on 6xx
+       depends on PPC_BOOK3S_32
        select CPM2
        help
          The MPC8260 is a typical embedded CPU made by Freescale.  Selecting

diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig
index 071f53b..ff0c69d 100644 (file)
--- a/arch/powerpc/platforms/83xx/Kconfig
+++ b/arch/powerpc/platforms/83xx/Kconfig
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 menuconfig PPC_83xx
        bool "83xx-based boards"
-       depends on 6xx
+       depends on PPC_BOOK3S_32
        select PPC_UDBG_16550
        select PPC_PCI_CHOICE
        select FSL_PCI if PCI

diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig
index bcd179d..df692aa 100644 (file)
--- a/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -2,7 +2,7 @@
 config PPC_86xx
 menuconfig PPC_86xx
        bool "86xx-based boards"
-       depends on 6xx
+       depends on PPC_BOOK3S_32
        select FSL_SOC
        select ALTIVEC
        help

diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 260a56b..5c48dd8 100644 (file)
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -40,7 +40,7 @@ config EPAPR_PARAVIRT
 
 config PPC_NATIVE
        bool
-       depends on 6xx || PPC64
+       depends on PPC_BOOK3S_32 || PPC64
        help
          Support for running natively on the hardware, i.e. without
          a hypervisor. This option is not user-selectable but should
@@ -48,7 +48,7 @@ config PPC_NATIVE
 
 config PPC_OF_BOOT_TRAMPOLINE
        bool "Support booting from Open Firmware or yaboot"
-       depends on 6xx || PPC64
+       depends on PPC_BOOK3S_32 || PPC64
        default y
        help
          Support from booting from Open Firmware or yaboot using an
@@ -197,7 +197,7 @@ endmenu
 
 config PPC601_SYNC_FIX
        bool "Workarounds for PPC601 bugs"
-       depends on 6xx && PPC_PMAC
+       depends on PPC_BOOK3S_32 && PPC_PMAC
        help
          Some versions of the PPC601 (the first PowerPC chip) have bugs which
          mean that extra synchronization instructions are required near
@@ -211,7 +211,7 @@ config PPC601_SYNC_FIX
 
 config TAU
        bool "On-chip CPU temperature sensor support"
-       depends on 6xx
+       depends on PPC_BOOK3S_32
        help
          G3 and G4 processors have an on-chip temperature sensor called the
          'Thermal Assist Unit (TAU)', which, in theory, can measure the on-die

diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index f4e2c57..a106e78 100644 (file)
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -24,6 +24,7 @@ choice
 config PPC_BOOK3S_32
        bool "512x/52xx/6xx/7xx/74xx/82xx/83xx/86xx"
        select PPC_FPU
+       select PPC_HAVE_PMU_SUPPORT
 
 config PPC_85xx
        bool "Freescale 85xx"
@@ -179,11 +180,6 @@ config PPC_BOOK3E
        def_bool y
        depends on PPC_BOOK3E_64
 
-config 6xx
-       def_bool y
-       depends on PPC32 && PPC_BOOK3S
-       select PPC_HAVE_PMU_SUPPORT
-
 config E500
        select FSL_EMB_PERFMON
        select PPC_FSL_BOOK3E
@@ -266,7 +262,7 @@ config PHYS_64BIT
 
 config ALTIVEC
        bool "AltiVec Support"
-       depends on 6xx || PPC_BOOK3S_64 || (PPC_E500MC && PPC64)
+       depends on PPC_BOOK3S_32 || PPC_BOOK3S_64 || (PPC_E500MC && PPC64)
        ---help---
          This option enables kernel support for the Altivec extensions to the
          PowerPC processor. The kernel currently supports saving and restoring

diff --git a/arch/powerpc/platforms/amigaone/Kconfig b/arch/powerpc/platforms/amigaone/Kconfig
index 03dc1e3..e03d26d 100644 (file)
--- a/arch/powerpc/platforms/amigaone/Kconfig
+++ b/arch/powerpc/platforms/amigaone/Kconfig
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 config AMIGAONE
        bool "Eyetech AmigaOne/MAI Teron"
-       depends on 6xx && BROKEN_ON_SMP
+       depends on PPC_BOOK3S_32 && BROKEN_ON_SMP
        select PPC_I8259
        select PPC_INDIRECT_PCI
        select PPC_UDBG_16550

diff --git a/arch/powerpc/platforms/chrp/Kconfig b/arch/powerpc/platforms/chrp/Kconfig
index ead99ef..43a2484 100644 (file)
--- a/arch/powerpc/platforms/chrp/Kconfig
+++ b/arch/powerpc/platforms/chrp/Kconfig
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 config PPC_CHRP
        bool "Common Hardware Reference Platform (CHRP) based machines"
-       depends on 6xx
+       depends on PPC_BOOK3S_32
        select HAVE_PCSPKR_PLATFORM
        select MPIC
        select PPC_I8259

diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig
index 8ea16db..527d4aa 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/Kconfig
+++ b/arch/powerpc/platforms/embedded6xx/Kconfig
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 config EMBEDDED6xx
        bool "Embedded 6xx/7xx/7xxx-based boards"
-       depends on 6xx && BROKEN_ON_SMP
+       depends on PPC_BOOK3S_32 && BROKEN_ON_SMP
 
 config LINKSTATION
        bool "Linkstation / Kurobox(HG) from Buffalo"