forked from luck/tmp_suning_uos_patched
f1baca8896
512a928aff("ARM: imx: build v7_cpu_resume() unconditionally") introduced an unintended linker error for i.MX6 configurations that have ARM_CPU_SUSPEND=n which can happen if neither CONFIG_PM, CONFIG_CPU_IDLE, nor ARM_PSCI_FW are selected. Fix this by having v7_cpu_resume() compiled only when cpu_resume() it calls is available as well. The C declaration for the function remains unguarded to avoid future code inadvertently using a stub and introducing a regression to the bug the original commit fixed. Cc: <stable@vger.kernel.org> Fixes:512a928aff("ARM: imx: build v7_cpu_resume() unconditionally") Reported-by: Clemens Gruber <clemens.gruber@pqgruber.com> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> Tested-by: Roland Hieber <rhi@pengutronix.de> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
110 lines
3.6 KiB
Makefile
110 lines
3.6 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
obj-y := cpu.o system.o irq-common.o
|
|
|
|
obj-$(CONFIG_SOC_IMX21) += mm-imx21.o
|
|
|
|
obj-$(CONFIG_SOC_IMX25) += cpu-imx25.o mach-imx25.o pm-imx25.o
|
|
|
|
obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o
|
|
obj-$(CONFIG_SOC_IMX27) += mm-imx27.o ehci-imx27.o
|
|
|
|
obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o iomux-imx31.o ehci-imx31.o
|
|
obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o ehci-imx35.o
|
|
|
|
imx5-pm-$(CONFIG_PM) += pm-imx5.o
|
|
obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o $(imx5-pm-y)
|
|
|
|
obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o
|
|
obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o
|
|
|
|
obj-$(CONFIG_MXC_TZIC) += tzic.o
|
|
obj-$(CONFIG_MXC_AVIC) += avic.o
|
|
|
|
obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o
|
|
|
|
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-imx6sx.o
|
|
obj-$(CONFIG_SOC_IMX6SX) += cpuidle-imx6sx.o
|
|
obj-$(CONFIG_SOC_IMX6UL) += cpuidle-imx6sx.o
|
|
obj-$(CONFIG_SOC_IMX7ULP) += cpuidle-imx7ulp.o
|
|
endif
|
|
|
|
ifdef CONFIG_SND_SOC_IMX_PCM_FIQ
|
|
obj-y += ssi-fiq.o
|
|
obj-y += ssi-fiq-ksym.o
|
|
endif
|
|
|
|
# i.MX21 based machines
|
|
obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o
|
|
|
|
# i.MX27 based machines
|
|
obj-$(CONFIG_MACH_MX27ADS) += mach-mx27ads.o
|
|
obj-$(CONFIG_MACH_MX27_3DS) += mach-mx27_3ds.o
|
|
obj-$(CONFIG_MACH_IMX27_VISSTRIM_M10) += mach-imx27_visstrim_m10.o
|
|
obj-$(CONFIG_MACH_PCA100) += mach-pca100.o
|
|
obj-$(CONFIG_MACH_IMX27_DT) += imx27-dt.o
|
|
|
|
# i.MX31 based machines
|
|
obj-$(CONFIG_MACH_MX31ADS) += mach-mx31ads.o
|
|
obj-$(CONFIG_MACH_MX31LILLY) += mach-mx31lilly.o mx31lilly-db.o
|
|
obj-$(CONFIG_MACH_MX31LITE) += mach-mx31lite.o mx31lite-db.o
|
|
obj-$(CONFIG_MACH_PCM037) += mach-pcm037.o
|
|
obj-$(CONFIG_MACH_PCM037_EET) += mach-pcm037_eet.o
|
|
obj-$(CONFIG_MACH_MX31_3DS) += mach-mx31_3ds.o
|
|
obj-$(CONFIG_MACH_MX31MOBOARD) += mach-mx31moboard.o mx31moboard-devboard.o \
|
|
mx31moboard-marxbot.o mx31moboard-smartbot.o
|
|
obj-$(CONFIG_MACH_QONG) += mach-qong.o
|
|
obj-$(CONFIG_MACH_ARMADILLO5X0) += mach-armadillo5x0.o
|
|
obj-$(CONFIG_MACH_KZM_ARM11_01) += mach-kzm_arm11_01.o
|
|
obj-$(CONFIG_MACH_BUG) += mach-bug.o
|
|
obj-$(CONFIG_MACH_IMX31_DT) += imx31-dt.o
|
|
|
|
# i.MX35 based machines
|
|
obj-$(CONFIG_MACH_PCM043) += mach-pcm043.o
|
|
obj-$(CONFIG_MACH_MX35_3DS) += mach-mx35_3ds.o
|
|
obj-$(CONFIG_MACH_VPR200) += mach-vpr200.o
|
|
obj-$(CONFIG_MACH_IMX35_DT) += imx35-dt.o
|
|
|
|
obj-$(CONFIG_HAVE_IMX_ANATOP) += anatop.o
|
|
obj-$(CONFIG_HAVE_IMX_GPC) += gpc.o
|
|
obj-$(CONFIG_HAVE_IMX_MMDC) += mmdc.o
|
|
obj-$(CONFIG_HAVE_IMX_SRC) += src.o
|
|
ifneq ($(CONFIG_SOC_IMX6)$(CONFIG_SOC_LS1021A),)
|
|
AFLAGS_headsmp.o :=-Wa,-march=armv7-a
|
|
obj-$(CONFIG_SMP) += headsmp.o platsmp.o
|
|
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
|
|
endif
|
|
obj-$(CONFIG_SOC_IMX6Q) += mach-imx6q.o
|
|
obj-$(CONFIG_SOC_IMX6SL) += mach-imx6sl.o
|
|
obj-$(CONFIG_SOC_IMX6SLL) += mach-imx6sl.o
|
|
obj-$(CONFIG_SOC_IMX6SX) += mach-imx6sx.o
|
|
obj-$(CONFIG_SOC_IMX6UL) += mach-imx6ul.o
|
|
obj-$(CONFIG_SOC_IMX7D_CA7) += mach-imx7d.o
|
|
obj-$(CONFIG_SOC_IMX7D_CM4) += mach-imx7d-cm4.o
|
|
obj-$(CONFIG_SOC_IMX7ULP) += mach-imx7ulp.o pm-imx7ulp.o
|
|
|
|
ifeq ($(CONFIG_SUSPEND),y)
|
|
AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a
|
|
obj-$(CONFIG_SOC_IMX6) += suspend-imx6.o
|
|
obj-$(CONFIG_SOC_IMX53) += suspend-imx53.o
|
|
endif
|
|
ifeq ($(CONFIG_ARM_CPU_SUSPEND),y)
|
|
AFLAGS_resume-imx6.o :=-Wa,-march=armv7-a
|
|
obj-$(CONFIG_SOC_IMX6) += resume-imx6.o
|
|
endif
|
|
obj-$(CONFIG_SOC_IMX6) += pm-imx6.o
|
|
|
|
obj-$(CONFIG_SOC_IMX1) += mach-imx1.o
|
|
obj-$(CONFIG_SOC_IMX50) += mach-imx50.o
|
|
obj-$(CONFIG_SOC_IMX51) += mach-imx51.o
|
|
obj-$(CONFIG_SOC_IMX53) += mach-imx53.o
|
|
|
|
obj-$(CONFIG_SOC_VF610) += mach-vf610.o
|
|
|
|
obj-$(CONFIG_SOC_LS1021A) += mach-ls1021a.o
|
|
|
|
obj-y += devices/
|