powerpc/32: Do not allow selection of e5500 or e6500 CPUs on PPC32

[ Upstream commit 5fd1c3473ddcac828d0a5dc1efe4d74a1b2ae61a ]

Commit bb82fdd204cc ("powerpc: Allow CPU selection also on PPC32")
enlarged the CPU selection logic to PPC32 by removing depend to
PPC64, and failed to restrict that depend to E5500_CPU and E6500_CPU.
Fortunately that got unnoticed because -mcpu=8540 will override the
-mcpu=e500mc64 or -mpcu=e6500 as they are ealier, but that's
fragile and may no be right in the future.

Add back the depend PPC64 on E5500_CPU and E6500_CPU.

Fixes: bb82fdd204cc ("powerpc: Allow CPU selection also on PPC32")
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/8abab4888da69ff78b73a56f64d9678a7bf684e9.1657549153.git.christophe.leroy@csgroup.eu
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index f0330ce498d1e1b0e0ba67d6f0442396bfa95b93..a9b20aa1dfd437ff56cf82923ea6ac84e36bfbf1 100644 (file)
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -151,11 +151,11 @@ config POWER9_CPU
 
 config E5500_CPU
        bool "Freescale e5500"
-       depends on E500
+       depends on PPC64 && E500
 
 config E6500_CPU
        bool "Freescale e6500"
-       depends on E500
+       depends on PPC64 && E500
 
 config 860_CPU
        bool "8xx family"