linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Shawn Guo <shawn.guo@linaro.org>
To: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arm-kernel@lists.infradead.org,
	Russell King <rmk+kernel@arm.linux.org.uk>,
	linux-kernel@vger.kernel.org, Eric Miao <eric.miao@linaro.org>,
	stable@vger.kernel.org
Subject: Re: [PATCH 6/6] ARM: imx: select ARM_CPU_SUSPEND when necessary
Date: Thu, 23 Aug 2012 22:55:27 +0800	[thread overview]
Message-ID: <20120823145524.GM24242@S2101-09.ap.freescale.net> (raw)
In-Reply-To: <201208231420.50247.arnd@arndb.de>

On Thu, Aug 23, 2012 at 02:20:50PM +0000, Arnd Bergmann wrote:
> From 4036e8f292887e7b1abc8eacec7d619abd608178 Mon Sep 17 00:00:00 2001
> From: Arnd Bergmann <arnd@arndb.de>
> Date: Fri, 17 Aug 2012 00:16:08 +0000
> Subject: [PATCH] ARM: imx: build i.MX6 functions only when needed
> 
> The head-v7.S contains a call to the generic cpu_suspend function,
> which is only available when selected by the i.MX6 code. As
> pointed out by Shawn Guo, i.MX does not actually use any

s/i.MX/i.MX5

Acked-by: Shawn Guo <shawn.guo@linaro.org>

> functions defined in head-v7.S. It is also needed only for
> the i.MX6 power management code and for the SMP code, so
> we can restrict building this file to situations in which
> at least one of those two is present.
> 
> Finally, other platforms with a similar file call it headsmp.S,
> so we can rename it to the same for consistency.
> 
> Without this patch, building imx5 standalone results in:
> 
> arch/arm/mach-imx/built-in.o: In function `v7_cpu_resume':
> arch/arm/mach-imx/head-v7.S:104: undefined reference to `cpu_resume'
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Eric Miao <eric.miao@linaro.org>
> Cc: Shawn Guo <shawn.guo@linaro.org>
> Cc: stable@vger.kernel.org
> 
> diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
> index e08adb7..d004d37 100644
> --- a/arch/arm/mach-imx/Makefile
> +++ b/arch/arm/mach-imx/Makefile
> @@ -71,14 +71,13 @@ obj-$(CONFIG_DEBUG_LL) += lluart.o
>  obj-$(CONFIG_HAVE_IMX_GPC) += gpc.o
>  obj-$(CONFIG_HAVE_IMX_MMDC) += mmdc.o
>  obj-$(CONFIG_HAVE_IMX_SRC) += src.o
> -obj-$(CONFIG_CPU_V7) += head-v7.o
> -AFLAGS_head-v7.o :=-Wa,-march=armv7-a
> -obj-$(CONFIG_SMP) += platsmp.o
> +AFLAGS_headsmp.o :=-Wa,-march=armv7-a
> +obj-$(CONFIG_SMP) += headsmp.o platsmp.o
>  obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
>  obj-$(CONFIG_SOC_IMX6Q) += clk-imx6q.o mach-imx6q.o
>  
>  ifeq ($(CONFIG_PM),y)
> -obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o
> +obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o headsmp.o
>  endif
>  
>  # i.MX5 based machines
> diff --git a/arch/arm/mach-imx/head-v7.S b/arch/arm/mach-imx/headsmp.S
> similarity index 100%
> rename from arch/arm/mach-imx/head-v7.S
> rename to arch/arm/mach-imx/headsmp.S

-- 
Regards,
Shawn

      reply	other threads:[~2012-08-23 14:54 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-22 15:13 [PATCH 0/6] ARM: randconfig bugs Arnd Bergmann
2012-08-22 15:13 ` [PATCH 1/6] ARM: ux500: don't select LEDS_GPIO for snowball Arnd Bergmann
2012-08-23 14:26   ` Arnd Bergmann
2012-08-27 23:40     ` Linus Walleij
2012-08-22 15:13 ` [PATCH 2/6] ARM: omap: allow building omap44xx without SMP Arnd Bergmann
2012-08-22 15:36   ` Shilimkar, Santosh
2012-08-22 17:22     ` Arnd Bergmann
2012-08-23  7:05       ` Shilimkar, Santosh
2012-08-23 12:12         ` Arnd Bergmann
2012-08-23 13:00           ` Shilimkar, Santosh
2012-08-23 13:32             ` Arnd Bergmann
2012-08-22 15:13 ` [PATCH 3/6] ARM: imx: build pm-imx5 code only when PM is enabled Arnd Bergmann
2012-08-23  2:07   ` Shawn Guo
2012-08-22 15:13 ` [PATCH 4/6] ARM: imx: fix ksz9021rn_phy_fixup Arnd Bergmann
2012-08-23  2:10   ` Shawn Guo
2012-08-22 15:13 ` [PATCH 5/6] ARM: imx: select CPU_FREQ_TABLE when needed Arnd Bergmann
2012-08-23  2:13   ` Shawn Guo
2012-08-22 15:13 ` [PATCH 6/6] ARM: imx: select ARM_CPU_SUSPEND when necessary Arnd Bergmann
2012-08-23  2:41   ` Shawn Guo
2012-08-23 14:20     ` Arnd Bergmann
2012-08-23 14:55       ` Shawn Guo [this message]

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=20120823145524.GM24242@S2101-09.ap.freescale.net \
    --to=shawn.guo@linaro.org \
    --cc=arnd@arndb.de \
    --cc=eric.miao@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rmk+kernel@arm.linux.org.uk \
    --cc=stable@vger.kernel.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).