summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2020-01-07 22:51:39 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-04-13 10:48:11 +0200
commit7dafb2c6fb46166af9fa4c3c57493a48f6ff2950 (patch)
tree665f2fc960adbfcd52399df23db11bff3abf6e93 /arch
parentcf70056626733696dfc008036641721788ad6c9a (diff)
downloadlinux-stable-7dafb2c6fb46166af9fa4c3c57493a48f6ff2950.tar.gz
linux-stable-7dafb2c6fb46166af9fa4c3c57493a48f6ff2950.tar.bz2
linux-stable-7dafb2c6fb46166af9fa4c3c57493a48f6ff2950.zip
ARM: imx: only select ARM_ERRATA_814220 for ARMv7-A
commit c74067a0f776c1d695a713a4388c3b6a094ee40a upstream. i.MX7D is supported for either the v7-A or the v7-M cores, but the latter causes a warning: WARNING: unmet direct dependencies detected for ARM_ERRATA_814220 Depends on [n]: CPU_V7 [=n] Selected by [y]: - SOC_IMX7D [=y] && ARCH_MXC [=y] && (ARCH_MULTI_V7 [=n] || ARM_SINGLE_ARMV7M [=y]) Make the select statement conditional. Fixes: 4562fa4c86c9 ("ARM: imx: Enable ARM_ERRATA_814220 for i.MX6UL and i.MX7D") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Shawn Guo <shawnguo@kernel.org> Cc: Christian Eggers <ceggers@arri.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-imx/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 4326c8f53462..95584ee02b55 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -557,7 +557,7 @@ config SOC_IMX7D
select PINCTRL_IMX7D
select SOC_IMX7D_CA7 if ARCH_MULTI_V7
select SOC_IMX7D_CM4 if ARM_SINGLE_ARMV7M
- select ARM_ERRATA_814220
+ select ARM_ERRATA_814220 if ARCH_MULTI_V7
help
This enables support for Freescale i.MX7 Dual processor.