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: 99808 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1492694qge; Mon, 15 May 2017 04:19:16 -0700 (PDT) X-Received: by 10.84.233.200 with SMTP id m8mr7640269pln.118.1494847156731; Mon, 15 May 2017 04:19:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494847156; cv=none; d=google.com; s=arc-20160816; b=aqjSmn9tk0SZa4UHaxlQXAzYyl7jPCmLtHclmPJDwPVClEhk6riLMH0oyY08I+MWVb J1HuX1cmgtRka5xGSMOeIGUQYeEHYkafU2saMkbMnSNEcd1H1InNliCnxDv+TYyB9MhP 0nA2X8kQhJIc6YpxR2qYhoRP4y3BvIulJo1SuSkJWpMVlYqdH656x5lRX9ngV2k3A6B7 15MvMaV3XvKU71AYop2rt7cCgZ1eDQuOTIxgiLebF8OFthtsZ7q2sIN6oCVB8YH2Xw0g jqdi0Kf4MwuPUeevTuy6BQqVFbLrVQTWaj1xhPA7lkaa9CbYVW84z229awy2evPh8Wtq kPYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=rm+dm9MA8qh077tD/9XvTn9G7PScJilcB6iEZPbUBUQ=; b=KHqzYRywmJDUb8ENfALAkyLikLW7LT/4/dP+0NMO8MgObIGbhYyG8XQ+EyrFD7+KX4 i9Am0XgZL+fv3+Z+8FA1QS9DOeGH/s7Vg02VdMGZTLDrIrDL/WLZ1Ha9TepZk7H1weK1 sr/cFKCON1c8xXrGhc8BaC1j3rMRdLh+FVRbLSmB2NrL/HGayHtt4tFPVwaLfrnSrzME QhKbEXpAQ1RfTDVV8yAZ6fYNX97EjUJbquC5ZgLXv1IM1ihCiye7CADGKR8LBQfHjq5S Tb/M0mT0m/LaFLOdS0kKqdVOfK+ydK4l4j6BrcKDb5kIOtKRtL85HxAuZ1d81ovYUmXR 7TjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w68si10257435pgw.334.2017.05.15.04.19.16; Mon, 15 May 2017 04:19:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934404AbdEOLSr (ORCPT + 25 others); Mon, 15 May 2017 07:18:47 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:41141 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933176AbdEOLSk (ORCPT ); Mon, 15 May 2017 07:18:40 -0400 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 Cc: linux-arch , Omar Sandoval , Gaurav Minocha , Grant Likely , Frank Rowand , Mark Rutland , Olof Johansson , Russell King , Masahiro Yamada , Fabio Estevam , Sascha Hauer , linux-kernel@vger.kernel.org, Rob Herring , linux-arm-kernel@lists.infradead.org, Shawn Guo 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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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(-) -- 2.7.4 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";