From patchwork Thu Feb 27 12:59:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 324797 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D70242C009C for ; Fri, 28 Feb 2014 00:00:17 +1100 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WJ0ZL-0000YL-Qy; Thu, 27 Feb 2014 13:00:07 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WJ0ZJ-00044j-Bj; Thu, 27 Feb 2014 13:00:05 +0000 Received: from moutng.kundenserver.de ([212.227.17.13]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WJ0ZE-00044C-HZ for linux-arm-kernel@lists.infradead.org; Thu, 27 Feb 2014 13:00:01 +0000 Received: from klappe2.localnet (HSI-KBW-5-56-226-176.hsi17.kabel-badenwuerttemberg.de [5.56.226.176]) by mrelayeu.kundenserver.de (node=mreue102) with ESMTP (Nemesis) id 0McWQK-1WafyB2Wie-00HfeF; Thu, 27 Feb 2014 13:59:35 +0100 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 1/4] ARM: imx6: move v7_cpu_resume() into suspend-imx6.S Date: Thu, 27 Feb 2014 13:59:27 +0100 User-Agent: KMail/1.12.2 (Linux/3.8.0-22-generic; KDE/4.3.2; x86_64; ; ) References: <1393422280-22283-1-git-send-email-shawn.guo@linaro.org> In-Reply-To: <1393422280-22283-1-git-send-email-shawn.guo@linaro.org> MIME-Version: 1.0 Message-Id: <201402271359.28159.arnd@arndb.de> X-Provags-ID: V02:K0:HpAsqZliQTOdtFj+E/JVbmHckCoyjXTQXMqRogO70tW lBO2Sty8e1O8ILoC2q53I7EEav9rgDNv/LPm7DRMaq7HAuNEzH rfk6PlINW71Hs/q7G+FbMuQCLXErc3AzG5HNyvSNZhaHgGSMMP UvoHVMvHIJvAOZboY3i2Cxn4c1Z0V2dNGy9jH3P+dmM99uI4Kj yifBzIjR3oDhrS9KSt4u6KG47b0zgSKWPEhju5D5OsEP4zSf6w kI05vK0sZ+9CtQ32z7rCsMSbOJo0mM3pSxhaO+9RV6eBq9rPyI FoZ9wF6ZdKm/Zc0jD/60ZKU3W6cXY5AjjCXqnzDI2mJznX1YNS 6cqKxZp3mxxnlb1wMsSA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140227_080000_791448_0BDF09CB X-CRM114-Status: UNSURE ( 8.70 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Shawn Guo , kernel@pengutronix.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org On Wednesday 26 February 2014, Shawn Guo wrote: > > AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a > -obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o headsmp.o suspend-imx6.o > +obj-$(CONFIG_SUSPEND) += suspend-imx6.o > +obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o headsmp.o > # i.MX6SL reuses i.MX6Q code > -obj-$(CONFIG_SOC_IMX6SL) += pm-imx6q.o headsmp.o suspend-imx6.o > +obj-$(CONFIG_SOC_IMX6SL) += pm-imx6q.o headsmp.o > I noticed a small bug during randconfig testing (starting to like my tests more recently): You build suspend-imx6.o for all SoCs now when SUSPEND is enabled, so this will fail for an ARMv5-only configuration. You probably need something like Arnd diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 9c776a0..4dd45db 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -103,10 +103,10 @@ obj-$(CONFIG_SOC_IMX6Q) += clk-imx6q.o mach-imx6q.o 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 +imx6-$(CONFIG_SUSPEND) += suspend-imx6.o +obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o $(imx6-y) # i.MX6SL reuses i.MX6Q code -obj-$(CONFIG_SOC_IMX6SL) += pm-imx6q.o +obj-$(CONFIG_SOC_IMX6SL) += pm-imx6q.o $(imx6-y) # i.MX5 based machines obj-$(CONFIG_MACH_MX51_BABBAGE) += mach-mx51_babbage.o