From patchwork Mon May 15 11:14:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 99806 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1491927qge; Mon, 15 May 2017 04:17:12 -0700 (PDT) X-Received: by 10.99.121.200 with SMTP id u191mr5510656pgc.113.1494847032149; Mon, 15 May 2017 04:17:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494847032; cv=none; d=google.com; s=arc-20160816; b=El5sJ6+sEMepbEpvQb+TV/7084Qzta/iwvLrfZK4Os2b/qxAaguNPoSuynEzzUhzSj gWPRgJrXYgVQVYLCwXwT5QKzo9RJOh/apfGHXQ7iAbwiX38+NjiCba7oVlFne0opV9O0 mH/CvrnLg9LZNROokU9/t3JpXkxvwMyLLaamzkLRdIgrM6F+ZZYClnExxlcHr/ioTzB7 U13fYHCKu6MLzidLXP/Nu8XIdY0c2znGm+CvIRJiqDs0wS38K4FREfrmjbs28xA+Csgv On0WC5c5cee7MYPLC9vu/vm/PoA2EmmmfzS9ggnVrE2w6P+5QxCVDGlQeHwc9aE/fQXd 73Mw== 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=4MPuyQfHg6ukxfFuAZCC5kI+gi25Jz5Z5CXJ+dGr4c4=; b=F4k3wQQxdpGm5oFc+twu974GziTkgLl3NA0FFaLAezo68vKtTwvJn2ANpCKuMzJ5ah 8RDcPvxg1o1vrJ2AUbUp2RI+UxYZBrCAGDtqx3QR8qeXwuZKUrUe+WdkYl0hl2VkZ6ut nJIIIrPj9KCvQQx+yfArGTPqt9BUPYpNTSTReJOKy4ZHPLxcyTBOp/zPYA+Z1FTm9eHx BuEvJdHP/WEV0gIH98f0RWBtrWyTcF0oG6gBZKCMMskxImwGMMXNbnsQnBnxNf4T1sNJ bNc4vt2Ue8HcWElgQx6/mYqs3V1vem07p/uU/aX3eJLqD7zc/Ye7+xcg+tmFCs3l73FQ waiQ== 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 e23si9889122pgn.381.2017.05.15.04.17.11; Mon, 15 May 2017 04:17:12 -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 S934382AbdEOLRA (ORCPT + 25 others); Mon, 15 May 2017 07:17:00 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:37284 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934313AbdEOLQj (ORCPT ); Mon, 15 May 2017 07:16:39 -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 v4FBF4MB008781; Mon, 15 May 2017 20:15:11 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com v4FBF4MB008781 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1494846912; bh=4MPuyQfHg6ukxfFuAZCC5kI+gi25Jz5Z5CXJ+dGr4c4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jy9/SORE4MjsZ4J2JkeZOyC97xjk2bNvZsUocWVup7R+N7tyZ4LOqn2oCcg8fx7xX FzP1Uz1MjzOeYqxAdCSJVyY5d0YOgYhAArNY8O/6dvWaYMMiH9l+dTF0lo7KgRRuIB P5ts4p0D2z0gxPJThUIGLITvw+8PW2/JH8eZk9riQfRbMs923XNxZQSYmZEyPicMa+ uILw15oS71wBgOzm0CD2vpW4nWlJUyer7xvAxVU1rvJq4JT0bmhfmx44jOaDsiZ7s+ ldWXaMOQteH7D/d4dks9ZWd3TSFExPaVv/q55SYYo532HAkAZ9yBytBcQrwxYzLMEP ZZZICtGKGM/aw== 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 , Michal Marek , linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org Subject: [PATCH 5/5] of: add scripts/dtc/include-prefixes to search path for both CPP and DTC Date: Mon, 15 May 2017 20:14:48 +0900 Message-Id: <1494846888-18966-6-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 We had include/dt-bindings as an include path only for CPP, and this makes sense because header files in dt-bindings contain useful macros that parsed by pre-processor. Commit 4027494ae6e3 ("ARM: dts: add arm/arm64 include symlinks") and commit 0a6081b673bb ("arm64: dts: add arm/arm64 include symlinks") allow us cross-arch DT reference, but this is only available for CPP's include directives, like #include It makes as much sense to include DT from another architecture by DTC's builtin include directive, like /include/ "arm/foo.dtsi" To achieve this, scripts/dtc/include-prefixes should be passed to both CPP and DTC. I refactored Makefile.lib a bit to not repeat the same path. Signed-off-by: Masahiro Yamada --- scripts/Makefile.lib | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 9c8f38a..dcc0d5f 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -173,8 +173,10 @@ cpp_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \ ld_flags = $(LDFLAGS) $(ldflags-y) +DTC_INCLUDE := $(srctree)/scripts/dtc/include-prefixes + dtc_cpp_flags = -Wp,-MD,$(depfile).pre.tmp -nostdinc \ - -I$(srctree)/scripts/dtc/include-prefixes \ + $(addprefix -I,$(DTC_INCLUDE)) \ -undef -D__DTS__ # Finds the multi-part object the current object will be linked into @@ -315,7 +317,7 @@ quiet_cmd_dtc = DTC $@ cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \ $(DTC) -O dtb -o $@ -b 0 \ - -i $(dir $<) $(DTC_FLAGS) \ + $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \ -d $(depfile).dtc.tmp $(dtc-tmp) ; \ cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)