aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-10-23 03:23:59 -0400
committerShawn Guo <shawn.guo@linaro.org>2012-10-23 03:37:51 -0400
commit68b25325a7fd290b5e472bba0df9cbe8c1a81d8f (patch)
treec61d19f6604532c557dd09219f39a63e537a0394
parent4cc3c840cb71da9a8e458bf89677a78ea0d61532 (diff)
ARM: imx: select HAVE_IMX_SRC when SMP is enabled
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>
-rw-r--r--arch/arm/mach-imx/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 66bcf1df14b9..f1bf610e2900 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -72,7 +72,7 @@ config HAVE_IMX_MMDC
72 bool 72 bool
73 73
74config HAVE_IMX_SRC 74config HAVE_IMX_SRC
75 bool 75 def_bool y if SMP
76 76
77config IMX_HAVE_IOMUX_V1 77config IMX_HAVE_IOMUX_V1
78 bool 78 bool
@@ -837,7 +837,6 @@ config SOC_IMX6Q
837 select HAVE_CAN_FLEXCAN if CAN 837 select HAVE_CAN_FLEXCAN if CAN
838 select HAVE_IMX_GPC 838 select HAVE_IMX_GPC
839 select HAVE_IMX_MMDC 839 select HAVE_IMX_MMDC
840 select HAVE_IMX_SRC
841 select HAVE_SMP 840 select HAVE_SMP
842 select MFD_SYSCON 841 select MFD_SYSCON
843 select PINCTRL 842 select PINCTRL