| Message ID | 6439884.YMH7C85FhG@wuerfel |
|---|---|
| State | New |
| Headers | show |
On Thu, Jul 03, 2014 at 04:16:06PM +0200, Arnd Bergmann wrote: > 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 <arnd@arndb.de> Thanks for the fixing, Arnd. Applied. Shawn > > diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile > index a364e20..d0179cd 100644 > --- a/arch/arm/mach-imx/Makefile > +++ b/arch/arm/mach-imx/Makefile > @@ -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 >
Hello Arnd, On Thu, Jul 03, 2014 at 04:16:06PM +0200, Arnd Bergmann wrote: > 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
On Thu, Jul 03, 2014 at 07:57:02PM +0200, Uwe Kleine-König wrote: > Hello Arnd, > > On Thu, Jul 03, 2014 at 04:16:06PM +0200, Arnd Bergmann wrote: > > 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
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index a364e20..d0179cd 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -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
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 <arnd@arndb.de>