Skip to content

Commit

Permalink
powerpc/32: Do not allow selection of e5500 or e6500 CPUs on PPC32
Browse files Browse the repository at this point in the history
[ Upstream commit 9be013b ]

Commit 0e00a8c ("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: 0e00a8c ("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>
  • Loading branch information
chleroy authored and gregkh committed Aug 17, 2022
1 parent 14965b8 commit 5414409
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/powerpc/platforms/Kconfig.cputype
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 5414409

Please sign in to comment.