Skip to contentSkip to conversation

ARM: imx: imx6sx uses imx6q cpuidle code

PATCH New Arnd Bergmann 3 participants 4 messages Jul 3, 2014 – Jul 4, 2014

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm i.MX and Layerscape
lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

PATCH 1/1 ARM: imx: imx6sx uses imx6q cpuidle code

Building a kernel for imx6sx but without imx6q support results in this link error because of the missing cpuidle driver:

arch/arm/mach-imx/built-in.o: In function `imx6sx_init_late'::(.init.text+0xc228):
undefined reference to `imx6q_cpuidle_init'

This patch adds a Makefile entry so we always build support for the imx6q_cpuidle code when at least one of the 6sx or 6q variants are enabled.

Signed-off-by Arnd Bergmann <[email protected]>
arch/arm/mach-imx/Makefile +1 -0
index a364e20..d0179cd 100644
@@ -31,6 +31,7 @@ ifeq ($(CONFIG_CPU_IDLE),y)
 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-imx6q.o
 endif
 
 ifdef CONFIG_SND_IMX_SOC
#1 lore raw

PATCH 1/1 ARM: imx: imx6sx uses imx6q cpuidle code

Quoted 11 lines · Arnd Bergmann

Building a kernel for imx6sx but without imx6q support results in this link error because of the missing cpuidle driver:

arch/arm/mach-imx/built-in.o: In function `imx6sx_init_late'::(.init.text+0xc228):
undefined reference to `imx6q_cpuidle_init'

This patch adds a Makefile entry so we always build support for the imx6q_cpuidle code when at least one of the 6sx or 6q variants are enabled.

Signed-off-by Arnd Bergmann <[email protected]>

Thanks for the fixing, Arnd. Applied.

Shawn

Quoted 14 lines
arch/arm/mach-imx/Makefile +1 -0
index a364e20..d0179cd 100644
@@ -31,6 +31,7 @@ ifeq ($(CONFIG_CPU_IDLE),y)
 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-imx6q.o
 endif
 
 ifdef CONFIG_SND_IMX_SOC
#2 lore raw

PATCH 1/1 ARM: imx: imx6sx uses imx6q cpuidle code

In reply to Arnd Bergmann

Hello Arnd,

Quoted 4 lines · Arnd Bergmann

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-imx6q.o

as this line looks wrong it might be worth a comment ...

Best regards
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
#3 lore raw

PATCH 1/1 ARM: imx: imx6sx uses imx6q cpuidle code

Quoted 8 lines · Uwe Kleine-K?nig

Hello Arnd,

Quoted 4 lines · Arnd Bergmann

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-imx6q.o

as this line looks wrong it might be worth a comment ...

Okay, I fixed it up as below.

# i.MX6SX reuses i.MX6Q cpuidle driver
obj-$(CONFIG_SOC_IMX6SX) += cpuidle-imx6q.o

Shawn