]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
ARM: imx: select HAVE_IMX_SRC when SMP is enabled
authorShawn Guo <shawn.guo@linaro.org>
Tue, 23 Oct 2012 07:23:59 +0000 (15:23 +0800)
committerShawn Guo <shawn.guo@linaro.org>
Tue, 23 Oct 2012 07:37:51 +0000 (15:37 +0800)
With being part of multi-platform support, SMP can be enabled by other
platform even when SOC_IMX6Q is deselected.  It leads to a situation
that arch/arm/mach-imx/platsmp.c is built without HAVE_IMX_SRC selection
which will cause build error.  For example, the following link errors
will be seen when building imx5 with other v7 platforms.

 arch/arm/mach-imx/built-in.o: In function `imx_cpu_die':
 platform-ahci-imx.c:(.text+0x219c): undefined reference to `imx_enable_cpu'
 arch/arm/mach-imx/built-in.o: In function `imx_boot_secondary':
 platform-ahci-imx.c:(.cpuinit.text+0x14): undefined reference to `imx_set_cpu_jump'
 platform-ahci-imx.c:(.cpuinit.text+0x20): undefined reference to `imx_enable_cpu'

Select HAVE_IMX_SRC as long as SMP is enabled to fix the problem.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
arch/arm/mach-imx/Kconfig

index 66bcf1df14b988cc8e5052fdbeb0c13c63c9de6a..f1bf610e29005c4ca6c87b038bb59ad061446de8 100644 (file)
@@ -72,7 +72,7 @@ config HAVE_IMX_MMDC
        bool
 
 config HAVE_IMX_SRC
-       bool
+       def_bool y if SMP
 
 config IMX_HAVE_IOMUX_V1
        bool
@@ -837,7 +837,6 @@ config SOC_IMX6Q
        select HAVE_CAN_FLEXCAN if CAN
        select HAVE_IMX_GPC
        select HAVE_IMX_MMDC
-       select HAVE_IMX_SRC
        select HAVE_SMP
        select MFD_SYSCON
        select PINCTRL