From patchwork Wed Sep 12 19:49:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 1446491 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (unknown [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id D422ADF238 for ; Wed, 12 Sep 2012 20:04:02 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TBswj-0008UJ-Sg; Wed, 12 Sep 2012 19:50:02 +0000 Received: from moutng.kundenserver.de ([212.227.17.9]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TBswf-0008T5-J5 for linux-arm-kernel@lists.infradead.org; Wed, 12 Sep 2012 19:49:58 +0000 Received: from klappe2.localnet (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mrbap2) with ESMTP (Nemesis) id 0LqWMz-1TgpyQ3ner-00eeAh; Wed, 12 Sep 2012 21:49:52 +0200 From: Arnd Bergmann To: Rob Herring Subject: Re: [PATCH 11/12] ARM: initial multiplatform support Date: Wed, 12 Sep 2012 19:49:48 +0000 User-Agent: KMail/1.12.2 (Linux/3.5.0; KDE/4.3.2; x86_64; ; ) References: <1346962375-26163-1-git-send-email-robherring2@gmail.com> <1346962375-26163-12-git-send-email-robherring2@gmail.com> In-Reply-To: <1346962375-26163-12-git-send-email-robherring2@gmail.com> MIME-Version: 1.0 Message-Id: <201209121949.49109.arnd@arndb.de> X-Provags-ID: V02:K0:8kDiW+JQU7kCfeEf+RNCePok9Md72jI+/Zx6jVfvJoS r4YM4rjwStWHdnk4UBwShtidFrCLLQHBbPBAYhbHIZnZtHH9rz k/hV7mgYRs6k6YVYiFm86i9rRTsP2cp8EXZdwd4/YuBJCy9qG8 ZZM6RrRh7PrCZ550UIg7Wkpv1+tyoppnxlS67XSTW+uzKB2veJ 5CsYk8Svjqeem3PvS2cAVnz34lCqvA6IHYXaYoDByaqlIcVsWt rLc3OaZFRxgFKwNfF6mXVofFrtbt71Z6egaUUrEZrMqlxxyGZk jOwhWSMa0UAWPGmdzFTTEBhhGAQOgBFexWPo1oawNncAgkbjt1 MLLK1kUke5HTOL1Tz4o8= X-Spam-Note: CRM114 invocation failed 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 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.17.9 listed in list.dnswl.org] -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: Andrew Lunn , Russell King , Jason Cooper , Rob Herring , Dinh Nguyen , Olof Johansson , Jamie Iles , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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)