Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12567bbd authored by Andrew Lunn's avatar Andrew Lunn Committed by Jason Cooper
Browse files

ARM: Fix default CPU selection for ARCH_MULTI_V5 



CPU_ARM926T should be selected if no other CPU is. Put the ! in the
right place so this works.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Tested-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Fixes: 24e860fb ("ARM: multiplatform: always pick one CPU type")
Cc: stable@vger.kernel.org # v3.11+
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 4b8f7a11

arch/arm/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -898,7 +898,7 @@ config ARCH_MULTI_V5 
	bool "ARMv5 based platforms (ARM926T, XSCALE, PJ1, ...)"

	bool "ARMv5 based platforms (ARM926T, XSCALE, PJ1, ...)"

	depends on !ARCH_MULTI_V6_V7

	depends on !ARCH_MULTI_V6_V7

	select ARCH_MULTI_V4_V5

	select ARCH_MULTI_V4_V5

	select CPU_ARM926T if (!CPU_ARM946E || CPU_ARM1020 || \

	select CPU_ARM926T if !(CPU_ARM946E || CPU_ARM1020 || \

		CPU_ARM1020E || CPU_ARM1022 || CPU_ARM1026 || \

		CPU_ARM1020E || CPU_ARM1022 || CPU_ARM1026 || \

		CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_FEROCEON)

		CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_FEROCEON)