diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2014-02-27 09:00:55 +0100 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2014-03-05 03:48:25 +0100 |
| commit | 6a5637e52eca3c1e38b6ed341fd3892392b58f56 (patch) | |
| tree | f388894dd14508eb11603a8891b4c1c5f00c26bc /arch/arm/mach-imx/Makefile | |
| parent | ARM: imx6: rename pm-imx6q.c to pm-imx6.c (diff) | |
| download | linux-6a5637e52eca3c1e38b6ed341fd3892392b58f56.tar.xz linux-6a5637e52eca3c1e38b6ed341fd3892392b58f56.zip | |
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 <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-imx/Makefile')
| -rw-r--r-- | arch/arm/mach-imx/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
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 |