powerpc: Replace PPC_85xx || PPC_BOOKE_64 by PPC_E500

PPC_E500 is the same as PPC_85xx || PPC_BOOKE_64

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

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index a7b58645cc3f1401806107df643a10899e87758f..f305c2f131770e9b47936feaaf958612b9522fb7 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -548,7 +548,7 @@ config PPC64_SUPPORTS_MEMORY_FAILURE
 
 config KEXEC
        bool "kexec system call"
-       depends on (PPC_BOOK3S || PPC_85xx || (44x && !SMP)) || PPC_BOOK3E_64
+       depends on PPC_BOOK3S || PPC_E500 || (44x && !SMP)
        select KEXEC_CORE
        help
          kexec is a system call that implements the ability to shutdown your

diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index 63fec86e41b41a1eaaa303bc09918d0462be6363..b92cb2b4d54d178c2cae4da5dda95f10665e1678 100644 (file)
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 menuconfig FSL_SOC_BOOKE
        bool "Freescale Book-E Machine Type"
-       depends on PPC_85xx || PPC_BOOK3E_64
+       depends on PPC_E500
        select FSL_SOC
        select PPC_UDBG_16550
        select MPIC

diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index 1746d19d058f21bc33c07fff5792f3e550576ee6..6a216e88423ba326aa0dcb9e7f570f840f4aa2fb 100644 (file)
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -487,7 +487,7 @@ config FORCE_SMP
        select SMP
 
 config SMP
-       depends on PPC_BOOK3S || PPC_BOOK3E_64 || PPC_85xx || PPC_47x
+       depends on PPC_BOOK3S || PPC_E500 || PPC_47x
        select GENERIC_IRQ_MIGRATION
        bool "Symmetric multi-processing support" if !FORCE_SMP
        help