From: Arnd Bergmann Date: Thu, 29 Aug 2019 13:43:49 +0000 (+0200) Subject: ARM: aspeed: ast2500 is ARMv6K X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b74d957f6317e60924d0d3c0c01750814c24611b;p=openwrt%2Fstaging%2Fblogic.git ARM: aspeed: ast2500 is ARMv6K Linux supports both the original ARMv6 level (early ARM1136) and ARMv6K (later ARM1136, ARM1176 and ARM11mpcore). ast2500 falls into the second categoy, being based on arm1176jzf-s. This is enabled by default when using ARCH_MULTI_V6, so we should not 'select CPU_V6'. Removing this will lead to more efficient use of atomic instructions. Fixes: 8c2ed9bcfbeb ("arm: Add Aspeed machine") Signed-off-by: Arnd Bergmann Reviewed-by: Joel Stanley --- diff --git a/arch/arm/mach-aspeed/Kconfig b/arch/arm/mach-aspeed/Kconfig index a15c3a291386..44ee6bac255e 100644 --- a/arch/arm/mach-aspeed/Kconfig +++ b/arch/arm/mach-aspeed/Kconfig @@ -26,7 +26,6 @@ config MACH_ASPEED_G4 config MACH_ASPEED_G5 bool "Aspeed SoC 5th Generation" depends on ARCH_MULTI_V6 - select CPU_V6 select PINCTRL_ASPEED_G5 help Say yes if you intend to run on an Aspeed ast2500 or similar