From patchwork Wed Feb 26 13:44:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 25350 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f70.google.com (mail-qa0-f70.google.com [209.85.216.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C415E20636 for ; Wed, 26 Feb 2014 13:45:03 +0000 (UTC) Received: by mail-qa0-f70.google.com with SMTP id m5sf4049524qaj.5 for ; Wed, 26 Feb 2014 05:45:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:mime-version:cc:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=1B/we8xqSsROAAuhD0OHoCBZ2SEqsIeWoVYGFHoBZWU=; b=Qp5PHUrZtQXm8/ZGyXav1cUWZ2QBz5W/9YGxQBAYqci2tc6bJfR3BYU0rbKX6xaLqW bsIfC/UW8etv0r3ZUVPcB2eNcwQmNjZLpD7ni/bxo2VbJgED/kD8KlpxqwSjKGjpXReT R7NkLhrHZ3B8+BVeDBCxflZQR9MOXaeSSZ6ghQHPF7kqkh+YRJWeAEEhy7NW+wrTXSub DYAXq/yW6rvO3XnFdKrXez4FVD3isDWugiR4qLppJHyFaUSlKwD3Z/lYI5fuxgHvzXcy EIvg9Xh4Yh6A3NLtQpdOZxRSz8gwxOt8mzZs0Og5lUutds5K02DmVX/ehslaew+OHmId G5tA== X-Gm-Message-State: ALoCoQnDZzjWeNFG+zhkoR19J7kx8qCaSDf5qESnZbGceqc5THCh0r90CU2DKMqg48CAPYJPtk9z X-Received: by 10.236.27.33 with SMTP id d21mr1990281yha.23.1393422302879; Wed, 26 Feb 2014 05:45:02 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.39.202 with SMTP id v68ls203094qgv.88.gmail; Wed, 26 Feb 2014 05:45:02 -0800 (PST) X-Received: by 10.52.227.7 with SMTP id rw7mr59845vdc.77.1393422302747; Wed, 26 Feb 2014 05:45:02 -0800 (PST) Received: from mail-ve0-f179.google.com (mail-ve0-f179.google.com [209.85.128.179]) by mx.google.com with ESMTPS id xn5si224331vdc.55.2014.02.26.05.45.02 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Feb 2014 05:45:02 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.179; Received: by mail-ve0-f179.google.com with SMTP id oz11so2133472veb.24 for ; Wed, 26 Feb 2014 05:45:02 -0800 (PST) X-Received: by 10.221.27.133 with SMTP id rq5mr6187112vcb.9.1393422302661; Wed, 26 Feb 2014 05:45:02 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp26584vcz; Wed, 26 Feb 2014 05:45:02 -0800 (PST) X-Received: by 10.181.13.82 with SMTP id ew18mr8061650wid.22.1393422301585; Wed, 26 Feb 2014 05:45:01 -0800 (PST) Received: from casper.infradead.org (casper.infradead.org. [2001:770:15f::2]) by mx.google.com with ESMTPS id l8si2781299wif.10.2014.02.26.05.45.01 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Feb 2014 05:45:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:770:15f::2 as permitted sender) client-ip=2001:770:15f::2; Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WIemt-0002Z1-3C; Wed, 26 Feb 2014 13:44:39 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WIemq-0007LT-Lg; Wed, 26 Feb 2014 13:44:36 +0000 Received: from va3ehsobe002.messaging.microsoft.com ([216.32.180.12] helo=va3outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WIemo-0007KZ-0Z for linux-arm-kernel@lists.infradead.org; Wed, 26 Feb 2014 13:44:35 +0000 Received: from mail131-va3-R.bigfish.com (10.7.14.228) by VA3EHSOBE003.bigfish.com (10.7.40.23) with Microsoft SMTP Server id 14.1.225.23; Wed, 26 Feb 2014 13:44:11 +0000 Received: from mail131-va3 (localhost [127.0.0.1]) by mail131-va3-R.bigfish.com (Postfix) with ESMTP id C509B80281; Wed, 26 Feb 2014 13:44:11 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1f42h2148h208ch1ee6h1de0h1fdah2073h2146h1202h1e76h2189h1d1ah1d2ah21bch1fc6hzz1de098h8275dh1de097hz2dh87h2a8h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1b2fh2222h224fh1fb3h1d0ch1d2eh1d3fh1dfeh1dffh1e23h1fe8h1ff5h2218h2216h226dh22d0h24afh2327h2336h2438h2461h2487h24d7h2516h2545h255eh25cch1151h1155h) X-FB-DOMAIN-IP-MATCH: fail Received: from mail131-va3 (localhost.localdomain [127.0.0.1]) by mail131-va3 (MessageSwitch) id 1393422250219066_32002; Wed, 26 Feb 2014 13:44:10 +0000 (UTC) Received: from VA3EHSMHS022.bigfish.com (unknown [10.7.14.252]) by mail131-va3.bigfish.com (Postfix) with ESMTP id 2A9E860079; Wed, 26 Feb 2014 13:44:10 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by VA3EHSMHS022.bigfish.com (10.7.99.32) with Microsoft SMTP Server (TLS) id 14.16.227.3; Wed, 26 Feb 2014 13:44:10 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-001.039d.mgd.msft.net (10.84.1.13) with Microsoft SMTP Server (TLS) id 14.3.158.2; Wed, 26 Feb 2014 13:44:07 +0000 Received: from S2101-09.ap.freescale.net ([10.192.185.98]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id s1QDi3TQ008570; Wed, 26 Feb 2014 06:44:06 -0700 From: Shawn Guo To: Subject: [PATCH 2/4] ARM: imx6: build headsmp.o only on CONFIG_SMP Date: Wed, 26 Feb 2014 21:44:38 +0800 Message-ID: <1393422280-22283-2-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1393422280-22283-1-git-send-email-shawn.guo@linaro.org> References: <1393422280-22283-1-git-send-email-shawn.guo@linaro.org> MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140226_084434_118278_98B5E333 X-CRM114-Status: GOOD ( 10.21 ) 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.7 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [216.32.180.12 listed in list.dnswl.org] Cc: Shawn Guo , kernel@pengutronix.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: shawn.guo@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 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 --- 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