From: Christophe Leroy Date: Mon, 11 Jul 2022 14:19:29 +0000 (+0200) Subject: powerpc/32: Do not allow selection of e5500 or e6500 CPUs on PPC32 X-Git-Tag: baikal/mips/sdk5.9~145 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=bb82168d710270627fb5a008700e457e8107381e;p=kernel.git powerpc/32: Do not allow selection of e5500 or e6500 CPUs on PPC32 [ Upstream commit b85ea0a947dca83d731197a576e020d05f6015fe ] Commit 26a1dbbd8a3a ("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: 26a1dbbd8a3a ("powerpc: Allow CPU selection also on PPC32") Signed-off-by: Christophe Leroy Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/8abab4888da69ff78b73a56f64d9678a7bf684e9.1657549153.git.christophe.leroy@csgroup.eu Signed-off-by: Sasha Levin --- diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype index 87a95cbff2f3f..81f8c96348321 100644 --- a/arch/powerpc/platforms/Kconfig.cputype +++ b/arch/powerpc/platforms/Kconfig.cputype @@ -170,11 +170,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"