From d2d31587a7f337d98f6a1c2cc356a456785fea8b Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 7 Mar 2016 14:48:51 +0100 Subject: arm/mach-imx: add i.MX7 features to SOC_IMX7 Allow for a build targeting iMX 7 devices without relying on configuration from i.MX6 and friends. Signed-off-by: Max Krummenacher Signed-off-by: Stefan Agner --- arch/arm/mach-imx/Kconfig | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 04ec0068fa4c..23cc9a49a04a 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -814,14 +814,14 @@ config SOC_IMX6 select ARM_ERRATA_775420 select ARM_GIC select CPU_V7 + select HAVE_ARM_SCU if SMP + select HAVE_ARM_TWD if SMP select HAVE_IMX_ANATOP select HAVE_IMX_GPC select HAVE_IMX_MMDC select HAVE_IMX_SRC select HAVE_SMP select MFD_SYSCON - select HAVE_ARM_SCU if SMP - select HAVE_ARM_TWD if SMP select PL310_ERRATA_769419 if CACHE_PL310 config SOC_IMX6Q @@ -876,24 +876,28 @@ config SOC_IMX6UL config SOC_IMX7 bool - select CPU_V7 + select ARM_ERRATA_814220 select ARM_GIC - select HAVE_SMP + select CPU_V7 + select HAVE_ARM_SCU if SMP + select HAVE_ARM_TWD if SMP + select HAVE_IMX_AMP select HAVE_IMX_ANATOP - select HAVE_IMX_SRC select HAVE_IMX_DDRC select HAVE_IMX_GPCV2 - select ARM_ERRATA_814220 + select HAVE_IMX_SRC + select HAVE_SMP + select MFD_SYSCON config SOC_IMX7D bool "i.MX7 Dual support" + select HAVE_IMX_RPMSG + select KEYBOARD_SNVS_PWRKEY select MIGHT_HAVE_PCI select PCI_DOMAINS if PCI - select SOC_IMX7 select PINCTRL_IMX7D - select HAVE_IMX_RPMSG select RPMSG - select KEYBOARD_SNVS_PWRKEY + select SOC_IMX7 help This enables support for Freescale i.MX7 Dual processor. -- cgit v1.2.3