| From 5b5e4ba0ab32ec9110e2d7939e7bf520368bb684 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 30 Dec 2020 16:17:51 +0100 |
| Subject: ARM: imx: fix imx8m dependencies |
| |
| From: Arnd Bergmann <arnd@arndb.de> |
| |
| [ Upstream commit 097530bf8cd469ef7b3d52ef00cafb64b33bacb1 ] |
| |
| Selecting ARM_GIC_V3 on non-CP15 processors leads to build failures |
| like |
| |
| arch/arm/include/asm/arch_gicv3.h: In function 'write_ICC_AP1R3_EL1': |
| arch/arm/include/asm/arch_gicv3.h:36:40: error: 'c12' undeclared (first use in this function) |
| 36 | #define __ICC_AP1Rx(x) __ACCESS_CP15(c12, 0, c9, x) |
| | ^~~ |
| |
| Add a dependency to only enable the gic driver when building for |
| at an ARMv7 target, which is the closes approximation to the ARMv8 |
| processor that is actually in this chip. |
| |
| Fixes: fc40200ebf82 ("soc: imx: increase build coverage for imx8m soc driver") |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Shawn Guo <shawnguo@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/soc/imx/Kconfig | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/soc/imx/Kconfig b/drivers/soc/imx/Kconfig |
| index a9370f4aacca9..05812f8ae7340 100644 |
| --- a/drivers/soc/imx/Kconfig |
| +++ b/drivers/soc/imx/Kconfig |
| @@ -13,7 +13,7 @@ config SOC_IMX8M |
| depends on ARCH_MXC || COMPILE_TEST |
| default ARCH_MXC && ARM64 |
| select SOC_BUS |
| - select ARM_GIC_V3 if ARCH_MXC |
| + select ARM_GIC_V3 if ARCH_MXC && ARCH_MULTI_V7 |
| help |
| If you say yes here you get support for the NXP i.MX8M family |
| support, it will provide the SoC info like SoC family, |
| -- |
| 2.27.0 |
| |
