From patchwork Sat Oct 6 13:49:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 1557791 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 73C37DF238 for ; Sat, 6 Oct 2012 13:52:05 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TKUlb-0000Qj-Ps; Sat, 06 Oct 2012 13:50:07 +0000 Received: from mail-pa0-f49.google.com ([209.85.220.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TKUlY-0000QN-FE for linux-arm-kernel@lists.infradead.org; Sat, 06 Oct 2012 13:50:04 +0000 Received: by mail-pa0-f49.google.com with SMTP id bi5so2951780pad.36 for ; Sat, 06 Oct 2012 06:50:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=XVqlforYVp2nEGvejJeYs+MqQuEj/rP/JkD6mTec8BE=; b=axv34up8tMtQe+SEKgpdytEK0fhGfZcqIPOcfBwQnl2Z77C/k8jjcsaejbADvGdh6/ qfPGt3CAwmGPcv+o8qfflyQIwjVejZK7dXAHc8/xoPbX85vfab7yznSTmtBv7p+mjULt +Z/MNTmDp5iuYMbaypb4wlLNQeFQvVH3HxH7FRd3LnJoVE0cgF3ncC6MQZ/Z6NLEplho mMOkzE+72idYHRGB93ByIeV0OiBI8QKbsTseRmvQNjEoYcCcFaOfvX39sLKjnZZN1nY2 uvXI5SMiVXRSHeWyzMo5xteH4Kjen0sFmBM9jre8NvX4RDWZ6tBtdlneDTGG0YGMMWk2 K3Mw== Received: by 10.68.234.36 with SMTP id ub4mr39060050pbc.68.1349531402457; Sat, 06 Oct 2012 06:50:02 -0700 (PDT) Received: from S2101-09.ap.freescale.net ([114.216.233.66]) by mx.google.com with ESMTPS id kr4sm3146056pbc.76.2012.10.06.06.49.52 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 06 Oct 2012 06:50:00 -0700 (PDT) From: Shawn Guo To: Olof Johansson Subject: [PATCH] ARM: dts: remove redundant imx dtb targets from Makefile Date: Sat, 6 Oct 2012 21:49:45 +0800 Message-Id: <1349531385-23961-1-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-Gm-Message-State: ALoCoQmQhu9tl49IpjWqqhLIbMdhwvgnReGYdwAv5TFHWg1Q/2OGY+Q79ErK268WGUThvieIJ65i X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.220.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Fabio Estevam , Shawn Guo , Rob Herring , Arnd Bergmann , 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: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org We already have CONFIG_ARCH_MXC cover imx5 and imx6 dtb targets. Remove the redundant ones with CONFIG_ARCH_IMX5 and CONFIG_SOC_IMX6Q. Signed-off-by: Shawn Guo --- Olof, Most likely, it's a merge problem eventually showing on manline. Please send the fix for 3.7-rc. Shawn arch/arm/boot/dts/Makefile | 8 -------- 1 file changed, 8 deletions(-) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 43c084c..fe39ac1 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -22,14 +22,6 @@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \ exynos4210-trats.dtb \ exynos5250-smdk5250.dtb dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb -dtb-$(CONFIG_ARCH_IMX5) += imx51-babbage.dtb \ - imx53-ard.dtb \ - imx53-evk.dtb \ - imx53-qsb.dtb \ - imx53-smd.dtb -dtb-$(CONFIG_SOC_IMX6Q) += imx6q-arm2.dtb \ - imx6q-sabrelite.dtb \ - imx6q-sabresd.dtb dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \ kirkwood-dns325.dtb \