diff mbox series

ARM: imx: fix dependencies on imx7ulp

Message ID 20181210204816.2516007-1-arnd@arndb.de
State Accepted
Commit 167e63702d090b831c513d726b11a412b70aab09
Headers show
Series ARM: imx: fix dependencies on imx7ulp | expand

Commit Message

Arnd Bergmann Dec. 10, 2018, 8:47 p.m. UTC
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: acb83c0eb036 ("ARM: imx: add initial support for imx7ulp")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 arch/arm/mach-imx/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.20.0

Comments

Shawn Guo Dec. 11, 2018, 2:48 a.m. UTC | #1
On Mon, Dec 10, 2018 at 09:47:59PM +0100, Arnd Bergmann wrote:
> 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: acb83c0eb036 ("ARM: imx: add initial support for imx7ulp")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>


Thanks for the fixup, Arnd.  Applied.

Shawn
diff mbox series

Patch

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.