[PATCH master 1/2] ARM: i.MX: fix cpu_is_imx on CONFIG_ARM_MULTIARCH configurations

[Ahmad Fatoum]

CONFIG_BOARD_ARM_GENERIC_DT is not the only way an i.MX initcall could
run on a non-i.MX SoC. Since the addition of the multiarch (really
multiplatform) support, this can also happen with native images.

Therefore check for both config options.

Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
---
 include/mach/imx/generic.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/mach/imx/generic.h b/include/mach/imx/generic.h
index 04086a2ea88d..a0f65391686b 100644
--- a/include/mach/imx/generic.h
+++ b/include/mach/imx/generic.h
@@ -293,7 +293,7 @@ static __always_inline void imx_set_cpu_type(unsigned int cpu_type)
 # define cpu_is_vf610()		(0)
 #endif
 
-#ifdef CONFIG_BOARD_ARM_GENERIC_DT
+#if defined(CONFIG_ARCH_MULTIARCH) || defined(CONFIG_BOARD_ARM_GENERIC_DT)
 # ifdef imx_cpu_type
 #  undef imx_cpu_type
 #  define imx_cpu_type __imx_cpu_type
-- 
2.39.5