diff options
author | Arnd Bergmann <arnd@arndb.de> | 2018-12-10 21:47:59 +0100 |
---|---|---|
committer | Shawn Guo <shawnguo@kernel.org> | 2018-12-11 10:41:20 +0800 |
commit | 167e63702d090b831c513d726b11a412b70aab09 (patch) | |
tree | 6997e3648ec35be520f1ee0f478e7cb932c3df71 /arch/arm/mach-imx/Kconfig | |
parent | de70d0e9d43dd5fa899ce3a1560a4d2536b6b71e (diff) | |
download | linux-stable-167e63702d090b831c513d726b11a412b70aab09.tar.gz linux-stable-167e63702d090b831c513d726b11a412b70aab09.tar.bz2 linux-stable-167e63702d090b831c513d726b11a412b70aab09.zip |
ARM: imx: fix dependencies on imx7ulp
The i.MX7D configuration was reworked, but that change did
not get propagated into the newly added i.MX7ULP, which now
produces a Kconfig warning:
WARNING: unmet direct dependencies detected for HAVE_ARM_ARCH_TIMER
Depends on [n]: CPU_V7 [=n]
Selected by [y]:
- SOC_IMX7ULP [=y] && ARCH_MXC [=y] && (ARCH_MULTI_V7 [=n] || ARM_SINGLE_ARMV7M [=y])
Change it to work the same way as i.MX7D.
Fixes: 1a1f919eb52e ("ARM: imx: Provide support for NXP i.MX7D Cortex-M4")
Fixes: de70d0e9d43d ("ARM: imx: add initial support for imx7ulp")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/mach-imx/Kconfig')
-rw-r--r-- | arch/arm/mach-imx/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index c12a05cbf268..9b8d4d6aa763 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -560,10 +560,10 @@ config SOC_IMX7D config SOC_IMX7ULP bool "i.MX7ULP support" - select ARM_GIC select CLKSRC_IMX_TPM - select HAVE_ARM_ARCH_TIMER select PINCTRL_IMX7ULP + select SOC_IMX7D_CA7 if ARCH_MULTI_V7 + select SOC_IMX7D_CM4 if ARM_SINGLE_ARMV7M help This enables support for Freescale i.MX7 Ultra Low Power processor. |