From: robherring2@gmail.com (Rob Herring)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 11/12] ARM: initial multiplatform support
Date: Wed, 12 Sep 2012 15:20:49 -0500 [thread overview]
Message-ID: <5050EEA1.5050205@gmail.com> (raw)
In-Reply-To: <201209121949.49109.arnd@arndb.de>
On 09/12/2012 02:49 PM, Arnd Bergmann wrote:
> On Thursday 06 September 2012, Rob Herring wrote:
>
>> +machine-$(CONFIG_ARCH_EXYNOS4) += exynos
>> +machine-$(CONFIG_ARCH_EXYNOS5) += exynos
>
>> +machine-$(CONFIG_MACH_SPEAR1310) += spear13xx
>> +machine-$(CONFIG_MACH_SPEAR1340) += spear13xx
>
>> +machine-$(CONFIG_MACH_SPEAR300) += spear3xx
>> +machine-$(CONFIG_MACH_SPEAR310) += spear3xx
>
>> +machine-$(CONFIG_MACH_SPEAR320) += spear3xx
>> +machine-$(CONFIG_MACH_SPEAR600) += spear6xx
>
> I did a little bit of testing and got this message:
>
> /home/arnd/linux-arm/Makefile:774: target `arch/arm/mach-spear13xx' given more than once in the same rule.
> arch/arm/mach-spear13xx/built-in.o:(.init.data+0x0): multiple definition of `spear13xx_smp_ops'
> arch/arm/mach-spear13xx/built-in.o:(.init.data+0x0): first defined here
>
> The patch below ensures that each machine is only listed once.
> Please fold this into your patch.
>
> Arnd
>
> diff --git a/arch/arm/Makefile b/arch/arm/Makefile
> index 32a6485..ff5fb29 100644
> --- a/arch/arm/Makefile
> +++ b/arch/arm/Makefile
> @@ -233,7 +233,7 @@ ifeq ($(CONFIG_ARCH_MULTIPLATFORM),y)
> MACHINE :=
> endif
>
> -machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
> +machdirs := $(sort $(patsubst %,arch/arm/mach-%/,$(machine-y)))
> platdirs := $(patsubst %,arch/arm/plat-%/,$(plat-y))
>
> ifneq ($(CONFIG_ARCH_MULTIPLATFORM),y)
Found this one as well. My fix is to use CONFIG_ARCH_EXYNOS,
CONFIG_ARCH_SPEAR3XX, etc. instead and remove the multiple lines.
I want to get this into -next and plan to send you a pull request soon.
Are you happy with the kconfig parts?
Rob
next prev parent reply other threads:[~2012-09-12 20:20 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-06 20:12 [PATCH v3 00/12] Initial multi-platform support Rob Herring
2012-09-06 20:12 ` [PATCH 01/12] ARM: move debug macros to common location Rob Herring
2012-09-06 20:12 ` [PATCH 02/12] ARM: highbank: move debug macros to include/debug Rob Herring
2012-09-06 20:12 ` [PATCH 03/12] ARM: vexpress: " Rob Herring
2012-09-06 20:12 ` [PATCH 04/12] ARM: mvebu: " Rob Herring
2012-09-07 15:08 ` Jason Cooper
2012-09-06 20:12 ` [PATCH 05/12] ARM: socfpga: " Rob Herring
2012-09-06 22:33 ` Dinh Nguyen
2012-09-06 23:35 ` Dinh Nguyen
2012-09-06 20:12 ` [PATCH 06/12] ARM: picoxcell: " Rob Herring
2012-09-13 14:16 ` Shawn Guo
2012-09-13 15:14 ` Rob Herring
2012-09-06 20:12 ` [PATCH 07/12] ARM: move all dtb targets out of Makefile.boot Rob Herring
2012-09-07 2:27 ` Shawn Guo
2012-09-07 2:36 ` Stephen Warren
2012-09-07 2:39 ` Shawn Guo
2012-09-11 12:02 ` Rob Herring
2012-09-11 12:06 ` Shawn Guo
2012-09-07 5:19 ` Andrew Lunn
2012-09-07 12:51 ` Rob Herring
2012-09-07 13:25 ` Arnd Bergmann
2012-09-07 13:46 ` Rob Herring
2012-09-10 15:52 ` Jean-Christophe PLAGNIOL-VILLARD
2012-09-10 17:51 ` Rob Herring
2012-09-11 4:49 ` Jean-Christophe PLAGNIOL-VILLARD
2012-09-11 5:41 ` Stephen Warren
2012-09-11 13:25 ` Jean-Christophe PLAGNIOL-VILLARD
2012-09-11 16:04 ` Rob Herring
2012-09-11 18:51 ` Nicolas Pitre
2012-09-11 18:08 ` [PATCH v2] " Rob Herring
2012-09-11 18:43 ` Stephen Warren
2012-09-06 20:12 ` [PATCH 08/12] ARM: picoxcell: remove dependency on mach/* headers Rob Herring
2012-09-06 20:12 ` [PATCH 09/12] ARM: vexpress: " Rob Herring
2012-09-06 20:12 ` [PATCH 10/12] ARM: mvebu: move armada-370-xp.h in mach dir Rob Herring
2012-09-07 15:11 ` Jason Cooper
2012-09-06 20:12 ` [PATCH 11/12] ARM: initial multiplatform support Rob Herring
2012-09-12 19:49 ` Arnd Bergmann
2012-09-12 20:20 ` Rob Herring [this message]
2012-09-12 20:27 ` Arnd Bergmann
2012-09-13 14:12 ` Shawn Guo
2012-09-06 20:12 ` [PATCH 12/12] ARM: vexpress: convert to multi-platform Rob Herring
2012-09-10 19:07 ` [PATCH v3 00/12] Initial multi-platform support Jamie Iles
2012-09-14 0:58 ` Shawn Guo
2012-09-14 13:00 ` Rob Herring
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=5050EEA1.5050205@gmail.com \
--to=robherring2@gmail.com \
--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).