diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2013-01-11 09:08:27 -0500 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2013-01-11 09:08:27 -0500 |
commit | aec99b7bda06436cd95229fe4841aeef29112e11 (patch) | |
tree | 37458083a9e8db125f6b16ccb1715bd16a60a9c7 /arch/arm | |
parent | e37f0d5b32c2a66677d0f2a21431a87e7e9ce22d (diff) |
ARM: imx: fix build error with !CONFIG_SMP
Commit 68b2532 (ARM: imx: select HAVE_IMX_SRC when SMP is enabled)
introduces a build error with imx_v6_v7_defconfig when CONFIG_SMP is
deselected.
LINK vmlinux
LD vmlinux.o
MODPOST vmlinux.o
GEN .version
CHK include/generated/compile.h
UPD include/generated/compile.h
CC init/version.o
LD init/built-in.o
arch/arm/mach-imx/built-in.o: In function `imx6q_restart':
platform-ahci-imx.c:(.text+0x448c): undefined reference to `imx_src_prepare_restart'
arch/arm/mach-imx/built-in.o: In function `imx6q_pm_enter':
platform-ahci-imx.c:(.text+0x4544): undefined reference to `imx_set_cpu_jump'
arch/arm/mach-imx/built-in.o: In function `imx6q_init_irq':
platform-ahci-imx.c:(.init.text+0xbef0): undefined reference to `imx_src_init'
make[1]: *** [vmlinux] Error 1
While the commit adds 'def_bool y if SMP' for HAVE_IMX_SRC, it should
not remove 'select HAVE_IMX_SRC' from SOC_IMX6Q, as the IMX6Q UP build
also needs HAVE_IMX_SRC. Add the HAVE_IMX_SRC select back for SOC_IMX6Q
to fix above build error.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-imx/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 1ad0d76de8c7..8e2f29293a58 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig | |||
@@ -853,6 +853,7 @@ config SOC_IMX6Q | |||
853 | select HAVE_CAN_FLEXCAN if CAN | 853 | select HAVE_CAN_FLEXCAN if CAN |
854 | select HAVE_IMX_GPC | 854 | select HAVE_IMX_GPC |
855 | select HAVE_IMX_MMDC | 855 | select HAVE_IMX_MMDC |
856 | select HAVE_IMX_SRC | ||
856 | select HAVE_SMP | 857 | select HAVE_SMP |
857 | select MFD_SYSCON | 858 | select MFD_SYSCON |
858 | select PINCTRL | 859 | select PINCTRL |