From patchwork Mon May 15 11:14:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 9726693 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 222C8601E7 for ; Mon, 15 May 2017 11:16:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1543728986 for ; Mon, 15 May 2017 11:16:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 08E7928989; Mon, 15 May 2017 11:16:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 33DF628986 for ; Mon, 15 May 2017 11:16:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=CUAHgR1cRIxF7gKwDIfn8/fPfwZqWN8GRaWY/SXXdoE=; b=LhGuFxSskg+MiTVFebR+8FgO8/ JdmdDOqKxXiCAo2GnMsh2JBJtr5aHqn3BwJzmYbY1ast11Mh3N3mYKqPS/inQiC6teJIBMx4bPcbz Qikc+mbmyeSgljmtskCj280pyEi5CXdc5x4fpcHUf0qNRwwXqFVJMYR7qkCFYMNgqS5cFESv1602A d1IpKZFVtz2rXpUJVzUPpGIzn5/7ixI6e/Az2EGd9b1+jd1V0E+jKV62GokZ/MirtADlcCNk7hnEw xCWZZK8l7q4jUtbXvDEVE6nBvniR/VFhn4JcDN9mNKAlL4i+W9z0ChiKL/frNvstuNi7xu4nosAB9 aOetEBOw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dADzE-0004nc-12; Mon, 15 May 2017 11:16:24 +0000 Received: from conuserg-08.nifty.com ([210.131.2.75]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dADzA-0004l8-L9 for linux-arm-kernel@lists.infradead.org; Mon, 15 May 2017 11:16:22 +0000 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id v4FBF4M8008781; Mon, 15 May 2017 20:15:07 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com v4FBF4M8008781 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1494846908; bh=rm+dm9MA8qh077tD/9XvTn9G7PScJilcB6iEZPbUBUQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QVRgBfvVzcY0V+7MeerZHJF4Izt7Mv8YEXYn4lsqbC8llz614PHRbDbkOPXz6j0XU bVTZ+yHBmWUwiXGzGRqWchgsp+d4n9gM13GzTcdCYME6vkALnbWfUYobOuJvhhf9PE 42QXoPdDIHfWJ9WWeW+HUdto5LuNdyQFzcpUQPfKcrgq2NKfVs38KwNXurUQJwe4SW 0YkR99jVuRLJ6YwzkG/utCQ3stFW79C4IYGgkiZZSyaSSaVVLHmuUYxVLARfGfJU1Y 4RqkGeq5w0FHZHUU7r5Jsd6cDLZCUEwQ2bsiOvmoiWkZC3ZfpK9fKPuSbwcCIjT1Fj Q3zQamhGSWU3Q== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: devicetree@vger.kernel.org Subject: [PATCH 2/5] ARM: dts: use #include "..." to include DT in the same directory Date: Mon, 15 May 2017 20:14:45 +0900 Message-Id: <1494846888-18966-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494846888-18966-1-git-send-email-yamada.masahiro@socionext.com> References: <1494846888-18966-1-git-send-email-yamada.masahiro@socionext.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170515_041621_073747_1411F488 X-CRM114-Status: GOOD ( 10.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arch , Mark Rutland , Masahiro Yamada , linux-kernel@vger.kernel.org, Russell King , Gaurav Minocha , Olof Johansson , Rob Herring , Sascha Hauer , Grant Likely , Shawn Guo , Omar Sandoval , Frank Rowand , Fabio Estevam , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Most of DT files in ARM use #include "..." to make pre-processor include DT in the same directory, but we have 3 exceptional files that use #include <...> for that. They must be fixed to remove -I$(srctree)/arch/$(SRCARCH)/boot/dts path from dtc_cpp_flags. Signed-off-by: Masahiro Yamada Acked-by: Shawn Guo --- arch/arm/boot/dts/imx6q-zii-rdu2.dts | 4 ++-- arch/arm/boot/dts/imx6qp-zii-rdu2.dts | 4 ++-- arch/arm/boot/dts/versatile-pb.dts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/imx6q-zii-rdu2.dts b/arch/arm/boot/dts/imx6q-zii-rdu2.dts index b2d3466..6be8a1e 100644 --- a/arch/arm/boot/dts/imx6q-zii-rdu2.dts +++ b/arch/arm/boot/dts/imx6q-zii-rdu2.dts @@ -41,8 +41,8 @@ /dts-v1/; -#include -#include +#include "imx6q.dtsi" +#include "imx6qdl-zii-rdu2.dtsi" / { model = "ZII RDU2 Board"; diff --git a/arch/arm/boot/dts/imx6qp-zii-rdu2.dts b/arch/arm/boot/dts/imx6qp-zii-rdu2.dts index 882b3bd..547a766 100644 --- a/arch/arm/boot/dts/imx6qp-zii-rdu2.dts +++ b/arch/arm/boot/dts/imx6qp-zii-rdu2.dts @@ -41,8 +41,8 @@ /dts-v1/; -#include -#include +#include "imx6qp.dtsi" +#include "imx6qdl-zii-rdu2.dtsi" / { model = "ZII RDU2+ Board"; diff --git a/arch/arm/boot/dts/versatile-pb.dts b/arch/arm/boot/dts/versatile-pb.dts index 33a8eb2..06e2331 100644 --- a/arch/arm/boot/dts/versatile-pb.dts +++ b/arch/arm/boot/dts/versatile-pb.dts @@ -1,4 +1,4 @@ -#include +#include "versatile-ab.dts" / { model = "ARM Versatile PB";