From patchwork Tue Jul 25 02:23:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 108604 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp38470qge; Mon, 24 Jul 2017 19:26:43 -0700 (PDT) X-Received: by 10.98.76.17 with SMTP id z17mr17564378pfa.136.1500949603156; Mon, 24 Jul 2017 19:26:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500949603; cv=none; d=google.com; s=arc-20160816; b=ffwL/KsUWf8Hshn+GyH+DITv9BVPTtMCOxk6eoR+Uo5T+koB62U7rHhJvIvzARKzYN s+9S5+lRDI3RKA6/KpX8/Dd1jEPE+vl/ZJAE8AKyLWQozOCRDSrLofN8IGSAHMh23F0L fCN8P0rWHAAgstRVy1K+Hexdy7aKtQHa5bl5UnXXE7xEXWjrHTTIADZePObzwzsz8tkh QsAvcrc7FgqePkxxhr6LJWVhK3mn/D5hnWCaR010KQGZFraRXPm8WK/fQYX/xEIaX4EO oYu6eyLUOvV55NbqoxOj2RoJSHrkFh1VsK78qFu/nA+YRDBqPuknRNDsq3fCtnpuMjsi 88Zw== 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=LQCQIsGNvc4BCrTtbgfwVlvMdJ4zQ6ROKzuSxeJZH2U=; b=gtaBYDWRDJly1M96Ap4R5nPVkqxg0byJGbu0/8q0QZ2JB9cVLUi1hGewxOcD3DlAfl S3qImjOJzXtZuxGUzJmrxenVAknUgEUNUePFQUJvvBmbiRybuXpp3Nh/+FQseHShCSXB 8GVHUVAx3H8+QQnICluHwHgQy828Aweg+YmGMuhK4kWhuaqKTZo+MY57ObDX1qaUfxP+ qONqgfXU4viYzyywlHyk6vR4q94ZRPtvMNbjM8g+KvIFjjKIN3KJiIUtsUdkzgfR2rhG Zgr4QIKzXBfBHkioSPy/FizQFN9tSW2bU86OGDP1YqhK3ih0/raSGuBYdM6gl1XQ9Iqx n/wQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.b=ojetWlfi; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-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 a26si7373823pfc.693.2017.07.24.19.26.42; Mon, 24 Jul 2017 19:26:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.b=ojetWlfi; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756010AbdGYC0g (ORCPT + 7 others); Mon, 24 Jul 2017 22:26:36 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:37830 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754079AbdGYC00 (ORCPT ); Mon, 24 Jul 2017 22:26:26 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id v6P2OfLw014470; Tue, 25 Jul 2017 11:24:45 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com v6P2OfLw014470 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1500949486; bh=+WndZ81Vyt3qcv3hDGJHyZb8C+YYJc4Zcao2BnG7PyI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ojetWlfiyGS62NusMnXubI3suGLubZNYx/Rkw6naR7JBAMXyM3vFf0TCAEZDd9mxE 6ZjFoQ2v1S4F7KFz4/2mTsazwlqHuMmL3VO6ObvypVfUrCRXL7p1JGBcYg2KY8hVXV lX6klN7vDghWUEXC6xbC3zVL1cBVIt7BwoWE0ynnKhMbOpMExySHI5HbWorq/eGRtJ REEKN9iQ4gwgkaBlkVULcOeeTLWwTFQJUm743sbyDB5nWT6EGXtZpqTyMNiTe2NLgM vIW5mbf1CP8v44KB2v0FpNXcCw9kfwkTJKBd92l2OO8RLrMXy2So2Zt+14PB78WFQq uFwN36aLDWAHQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: devicetree@vger.kernel.org, Rob Herring 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 3/3] of: search scripts/dtc/include-prefixes path for both CPP and DTC Date: Tue, 25 Jul 2017 11:23:36 +0900 Message-Id: <1500949416-24105-4-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1500949416-24105-1-git-send-email-yamada.masahiro@socionext.com> References: <1500949416-24105-1-git-send-email-yamada.masahiro@socionext.com> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Since commit d5d332d3f7e8 ("devicetree: Move include prefixes from arch to separate directory"), cross-arch DT reference works well, but only for CPP style #include directives. It makes as much sense to share DT between different architectures by using DTC's /include/ directives. So, 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 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 9c8f38ac2620..dcc0d5fdf5a2 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)