From: Shawn Guo Date: Thu, 27 Feb 2014 08:00:55 +0000 (+0800) Subject: ARM: imx6: build suspend-imx6.o with CONFIG_SOC_IMX6 X-Git-Tag: firefly_0821_release~176^2~4133^2~19^2~1 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6a5637e52eca3c1e38b6ed341fd3892392b58f56;p=firefly-linux-kernel-4.4.55.git ARM: imx6: build suspend-imx6.o with CONFIG_SOC_IMX6 Even when CONFIG_SUSPEND is enabled, it makes no sense to build suspend-imx6.o if none of i.MX6 support is built in. Let's build suspend-imx6.o only when both CONFIG_SUSPEND and CONFIG_SOC_IMX6 are enabled. Signed-off-by: Shawn Guo --- diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 19a6d0e98f2d..f4ed83032dd0 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -102,8 +102,10 @@ obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o obj-$(CONFIG_SOC_IMX6Q) += clk-imx6q.o mach-imx6q.o obj-$(CONFIG_SOC_IMX6SL) += clk-imx6sl.o mach-imx6sl.o +ifeq ($(CONFIG_SUSPEND),y) AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a -obj-$(CONFIG_SUSPEND) += suspend-imx6.o +obj-$(CONFIG_SOC_IMX6) += suspend-imx6.o +endif obj-$(CONFIG_SOC_IMX6) += pm-imx6.o # i.MX5 based machines