| Message ID | 20180315151345.3089601-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | 18b6843f9628917b2f3162273a4fd18a208fe76e |
| Headers | show |
| Series | [1/2] ARM: imx: fix imx6sll-only build | expand |
On Thu, Mar 15, 2018 at 04:13:18PM +0100, Arnd Bergmann wrote: > When selecting SOC_IMX6SLL but not SOC_IMX6SL, we get a link error: > > arch/arm/mach-imx/mach-imx6sl.o: In function `imx6sl_init_late': > mach-imx6sl.c:(.init.text+0x14): undefined reference to `imx6sl_cpuidle_init' > > This adds the missing line to the Makefile to also build the cpuidle > support that we need here. > > Fixes: dee5dee2a5b2 ("ARM: imx: Add basic msl support for imx6sll") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Shawn Guo <shawnguo@kernel.org>
On Fri, Mar 16, 2018 at 1:48 AM, Shawn Guo <shawnguo@kernel.org> wrote: > On Thu, Mar 15, 2018 at 04:13:18PM +0100, Arnd Bergmann wrote: >> When selecting SOC_IMX6SLL but not SOC_IMX6SL, we get a link error: >> >> arch/arm/mach-imx/mach-imx6sl.o: In function `imx6sl_init_late': >> mach-imx6sl.c:(.init.text+0x14): undefined reference to `imx6sl_cpuidle_init' >> >> This adds the missing line to the Makefile to also build the cpuidle >> support that we need here. >> >> Fixes: dee5dee2a5b2 ("ARM: imx: Add basic msl support for imx6sll") >> Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > Acked-by: Shawn Guo <shawnguo@kernel.org> Thanks. Applied both now. Arnd
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 78fa86aedf34..2327e3e876d8 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -26,6 +26,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_IMX6SLL) += cpuidle-imx6sl.o obj-$(CONFIG_SOC_IMX6SX) += cpuidle-imx6sx.o obj-$(CONFIG_SOC_IMX6UL) += cpuidle-imx6sx.o endif
When selecting SOC_IMX6SLL but not SOC_IMX6SL, we get a link error: arch/arm/mach-imx/mach-imx6sl.o: In function `imx6sl_init_late': mach-imx6sl.c:(.init.text+0x14): undefined reference to `imx6sl_cpuidle_init' This adds the missing line to the Makefile to also build the cpuidle support that we need here. Fixes: dee5dee2a5b2 ("ARM: imx: Add basic msl support for imx6sll") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- arch/arm/mach-imx/Makefile | 1 + 1 file changed, 1 insertion(+) -- 2.9.0