diff options
| author | Octavian Purdila <octavian.purdila@nxp.com> | 2017-06-12 11:58:44 +0300 |
|---|---|---|
| committer | Octavian Purdila <octavian.purdila@nxp.com> | 2017-06-14 10:35:25 +0300 |
| commit | c548ad11ca30e857c2c1328ecdce3b04eab4e520 (patch) | |
| tree | 9a681bf2b8816e58ac78c9c7a837a9dc5376f2c2 /arch | |
| parent | d0606509708af2cf089b82278c49f59956badc24 (diff) | |
MLK-15047-2: ARM: imx: add IMX_SOC_IMX7
IMX_SOC_IMX7 is referenced in makefiles and kconfig but it is not
defined, so define it and select it for both IMX7D and IMX7ULP.
Fixes the following build errors:
arch/arm/mach-imx/built-in.o: In function `update_lpddr2_freq_smp':
platform-imx-dma.c:(.text+0xf7c): undefined reference to `imx_scu_base'
platform-imx-dma.c:(text+0xf88): undefined reference to `imx_scu_base'
arch/arm/mach-imx/built-in.o: In function `update_ddr_freq_imx_smp':
platform-imx-dma.c:(text+0x330c): undefined reference to `imx_scu_base'
platform-imx-dma.c:(text+0x3318): undefined reference to `imx_scu_base'
Makefile:969: recipe for target 'vmlinux' failed
make: *** [vmlinux] Error 1
Signed-off-by: Octavian Purdila <octavian.purdila@nxp.com>
Reviewed-by: Leonard Crestez <leonard.crestez@nxp.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 49496482495d..34f2c63bcaf2 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -569,22 +569,26 @@ config SOC_IMX6ULL help This enables support for Freescale i.MX6 ULL processor. +config SOC_IMX7 + bool + select CPU_V7 + select ARM_GIC + select HAVE_IMX_MU + select HAVE_IMX_RPMSG + select RPMSG + config SOC_IMX7D bool "i.MX7 Dual support" + select SOC_IMX7 select PCI_DOMAINS if PCI select PINCTRL_IMX7D - select ARM_GIC select HAVE_ARM_ARCH_TIMER select HAVE_IMX_ANATOP select HAVE_IMX_MMDC select HAVE_IMX_DDRC select HAVE_IMX_SRC - select HAVE_IMX_MU - select HAVE_IMX_RPMSG - select RPMSG select KEYBOARD_SNVS_PWRKEY select HAVE_IMX_GPCV2 - select CPU_V7 select ARM_ERRATA_814220 help @@ -615,14 +619,9 @@ config SOC_IMX6SLL config SOC_IMX7ULP bool "i.MX7ULP support" - select CPU_V7 - select ARM_GIC + select SOC_IMX7 select CLKSRC_IMX_TPM - select HAVE_IMX_MU select PINCTRL_IMX7ULP - select HAVE_IMX_RPMSG - select RPMSG - help This enables support for Freescale i.MX7 Ultra Low Power processor. |