From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934378AbdEOLQ7 (ORCPT ); Mon, 15 May 2017 07:16:59 -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 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com v4FBF4MB008781 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 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(-) 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