ARM: imx: build i.MX6 functions only when needed
authorArnd Bergmann <arnd@arndb.de>
Fri, 17 Aug 2012 00:16:08 +0000 (00:16 +0000)
committerArnd Bergmann <arnd@arndb.de>
Thu, 23 Aug 2012 15:26:53 +0000 (17:26 +0200)
commit1fc593feaf8e440511f381f4cdff483b55bbf546
tree457771ef0688d6798c54abe0a4cb36b5d495b65e
parentf637c4c9405e21f44cf0045eaf77eddd3a79ca5a
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.MX5 does not actually use any
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>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Cc: Eric Miao <eric.miao@linaro.org>
Cc: stable@vger.kernel.org
arch/arm/mach-imx/Makefile
arch/arm/mach-imx/head-v7.S [deleted file]
arch/arm/mach-imx/headsmp.S [new file with mode: 0644]