From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/4] ARM: imx6: build headsmp.o only on CONFIG_SMP
Date: Wed, 26 Feb 2014 21:44:38 +0800 [thread overview]
Message-ID: <1393422280-22283-2-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1393422280-22283-1-git-send-email-shawn.guo@linaro.org>
With v7_cpu_resume() being moved out of headsmp.S, all the remaining
code in the file is only needed by CONFIG_SMP build. So we can control
the build of headsmp.o with only obj-$(CONFIG_SMP) now.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
arch/arm/mach-imx/Makefile | 4 ++--
arch/arm/mach-imx/headsmp.S | 2 --
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index b4c19cd..9c776a0 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -104,9 +104,9 @@ obj-$(CONFIG_SOC_IMX6SL) += clk-imx6sl.o mach-imx6sl.o
AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a
obj-$(CONFIG_SUSPEND) += suspend-imx6.o
-obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o headsmp.o
+obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o
# i.MX6SL reuses i.MX6Q code
-obj-$(CONFIG_SOC_IMX6SL) += pm-imx6q.o headsmp.o
+obj-$(CONFIG_SOC_IMX6SL) += pm-imx6q.o
# i.MX5 based machines
obj-$(CONFIG_MACH_MX51_BABBAGE) += mach-mx51_babbage.o
diff --git a/arch/arm/mach-imx/headsmp.S b/arch/arm/mach-imx/headsmp.S
index e4b9fed..6e1a56d 100644
--- a/arch/arm/mach-imx/headsmp.S
+++ b/arch/arm/mach-imx/headsmp.S
@@ -15,7 +15,6 @@
.section ".text.head", "ax"
-#ifdef CONFIG_SMP
diag_reg_offset:
.word g_diag_reg - .
@@ -32,4 +31,3 @@ ENTRY(v7_secondary_startup)
set_diag_reg
b secondary_startup
ENDPROC(v7_secondary_startup)
-#endif
--
1.7.9.5
next prev parent reply other threads:[~2014-02-26 13:44 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-26 13:44 [PATCH 1/4] ARM: imx6: move v7_cpu_resume() into suspend-imx6.S Shawn Guo
2014-02-26 13:44 ` Shawn Guo [this message]
2014-02-26 21:00 ` [PATCH 2/4] ARM: imx6: build headsmp.o only on CONFIG_SMP Russell King - ARM Linux
2014-02-27 8:24 ` Shawn Guo
2014-02-26 13:44 ` [PATCH 3/4] ARM: imx6: call suspend_set_ops() from suspend routine Shawn Guo
2014-02-26 13:44 ` [PATCH 4/4] ARM: imx6: do not call imx6q_suspend_init() with !CONFIG_SUSPEND Shawn Guo
2014-02-27 12:59 ` [PATCH 1/4] ARM: imx6: move v7_cpu_resume() into suspend-imx6.S Arnd Bergmann
2014-02-27 13:12 ` Shawn Guo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1393422280-22283-2-git-send-email-shawn.guo@linaro.org \
--to=shawn.guo@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).