[PATCH 5/5] of: add scripts/dtc/include-prefixes to search path for both CPP and DTC

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Masahiro Yamada <yamada.masahiro@socionext.com>
Newsgroups	linux.kernel
Subject	[PATCH 5/5] of: add scripts/dtc/include-prefixes to search path for both CPP and DTC
Date	Mon, 15 May 2017 13:20:01 +0200
Message-ID	<tHmcF-7ob-1@gated-at.bofh.it> (permalink)
References	<tHmcF-7ob-3@gated-at.bofh.it>
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]
X-Mailer	git-send-email 2.7.4
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	51
Organization	linux.* mail to news gateway
X-Original-Cc	linux-arch <linux-arch@vger.kernel.org>, Omar Sandoval <osandov@osandov.com>, Gaurav Minocha <gaurav.minocha.os@gmail.com>, Grant Likely <grant.likely@linaro.org>, Frank Rowand <frowand.list@gmail.com>, Mark Rutland <mark.rutland@arm.com>, Olof Johansson <olof@lixom.net>, Russell King <linux@armlinux.org.uk>, Masahiro Yamada <yamada.masahiro@socionext.com>, Michal Marek <mmarek@suse.com>, linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org
X-Original-Date	Mon, 15 May 2017 20:14:48 +0900
X-Original-Message-ID	<1494846888-18966-6-git-send-email-yamada.masahiro@socionext.com>
X-Original-References	<1494846888-18966-1-git-send-email-yamada.masahiro@socionext.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1641551

Show key headers only | View raw

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 <arm/foo.dtsi>

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 <yamada.masahiro@socionext.com>
---

 scripts/Makefile.lib | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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)
 
-- 
2.7.4

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 5/5] of: add scripts/dtc/include-prefixes to search path for both CPP and DTC Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-05-15 13:20 +0200

csiph-web