diff mbox

ARM: imx: build cpuidle-imx6sx.o for imx6ul

Message ID 20160906125338.1530603-1-arnd@arndb.de
State New
Headers show

Commit Message

Arnd Bergmann Sept. 6, 2016, 12:53 p.m. UTC 
The imx6ul soc code gained support for cpuidle, but that causes
a link failure if CONFIG_SOC_IMX6SX is disabled:

arch/arm/mach-imx/mach-imx6ul.o: In function `imx6ul_init_late':
mach-imx6ul.c:(.init.text+0xc): undefined reference to `imx6sx_cpuidle_init'

This adds the file containing the imx6sx_cpuidle_init function
to the kernel for 6ul-only configurations.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 547e8f526959 ("ARM: imx: add cpuidle support for i.mx6ul")
---
 arch/arm/mach-imx/Makefile | 1 +
 1 file changed, 1 insertion(+)

Comments

Shawn Guo Sept. 8, 2016, 2:13 p.m. UTC | #1 
On Tue, Sep 06, 2016 at 02:53:25PM +0200, Arnd Bergmann wrote:
> The imx6ul soc code gained support for cpuidle, but that causes
> a link failure if CONFIG_SOC_IMX6SX is disabled:
> 
> arch/arm/mach-imx/mach-imx6ul.o: In function `imx6ul_init_late':
> mach-imx6ul.c:(.init.text+0xc): undefined reference to `imx6sx_cpuidle_init'
> 
> This adds the file containing the imx6sx_cpuidle_init function
> to the kernel for 6ul-only configurations.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: 547e8f526959 ("ARM: imx: add cpuidle support for i.mx6ul")

Applied, thanks.
diff mbox

Patch

diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index edce8dfa581d..737450fe790c 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -27,6 +27,7 @@  obj-$(CONFIG_SOC_IMX5) += cpuidle-imx5.o
 obj-$(CONFIG_SOC_IMX6Q) += cpuidle-imx6q.o
 obj-$(CONFIG_SOC_IMX6SL) += cpuidle-imx6sl.o
 obj-$(CONFIG_SOC_IMX6SX) += cpuidle-imx6sx.o
+obj-$(CONFIG_SOC_IMX6UL) += cpuidle-imx6sx.o
 endif
 
 ifdef CONFIG_SND_IMX_SOC