From patchwork Tue Aug 11 08:47:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 6989781 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 33AF1C05AC for ; Tue, 11 Aug 2015 08:49:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1A8D82068F for ; Tue, 11 Aug 2015 08:49:45 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 08C7F20686 for ; Tue, 11 Aug 2015 08:49:44 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZP5Dp-0000LG-3L; Tue, 11 Aug 2015 08:47:49 +0000 Received: from smtp02.citrix.com ([66.165.176.63]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZP5Dm-0000Ja-78 for linux-arm-kernel@lists.infradead.org; Tue, 11 Aug 2015 08:47:47 +0000 X-IronPort-AV: E=Sophos;i="5.15,652,1432598400"; d="scan'208";a="293268909" Message-ID: <1439282834.9747.189.camel@citrix.com> Subject: Re: [PATCH v4] dtb: Create a common home for cross-architecture dtsi files. From: Ian Campbell To: Masahiro Yamada Date: Tue, 11 Aug 2015 09:47:14 +0100 In-Reply-To: References: <1438617993-1012-1-git-send-email-ian.campbell@citrix.com> X-Mailer: Evolution 3.16.3-1 MIME-Version: 1.0 X-DLP: MIA2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150811_014746_417039_A57FFC15 X-CRM114-Status: GOOD ( 19.58 ) X-Spam-Score: -4.2 (----) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Lorenzo Pieralisi , Russell King , Pawel Moll , Linux Kbuild mailing list , Catalin Marinas , Sudeep Holla , Liviu Dudau , Linux Kernel Mailing List , Will Deacon , Rob Herring , Kristina Martsenko , Kumar Gala , Kevin Hilman , linux-arm-kernel Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Tue, 2015-08-11 at 13:00 +0900, Masahiro Yamada wrote: > Hi > > 2015-08-04 1:06 GMT+09:00 Ian Campbell : > > Commit 9ccd608070b6 ("arm64: dts: add device tree for ARM SMM-A53x2 on > > LogicTile Express 20MG") added a new dts file to arch/arm64 which > > included "../../../../arm/boot/dts/vexpress-v2m-rs1.dtsi", i.e. a > > .dtsi supplied by arch/arm. > > > > Unfortunately this causes some issues for the split device tree > > repository[0], since things get moved around there. In that context > > the new .dts ends up at src/arm64/arm/vexpress-v2f-1xv7-ca53x2.dts > > while the include is at src/arm/vexpress-v2m-rs1.dtsi. > > > > The sharing of the .dtsi is legitimate since the baseboard is the same > > for various vexpress systems whatever processor they use. > > > > Rather than using ../../ tricks to pickup .dtsi files from another > > arch this patch creates a new directory kernel/dts as a home for such > > cross-arch .dtsi files and arranges for it to be in the include path > > for both dtc and cpp. The dtsi file itself is moved into a vendor > > subdir in this case "arm" (the vendor, not the ARCH=). > > > Question: > If this patch is applied, which directory will be created in > device-tree-rebasing? > src/kernel/, src/common/, or something else? > Either will do, of course. Below is the patch against the device-tree-rebasing.git, I went (pretty much arbitrarily) with common at the top level. commit 0524b00e5bd7b98a2a9ef85c1f5f2a8d93bcbeb6 Author: Ian Campbell Date: Tue Jul 21 17:27:13 2015 +0100 Handle new kernel/dts subtree. Rewrite its contents to common/ and include in the CPP and DTC include paths. Signed-off-by: Ian Campbell diff --git a/Makefile b/Makefile index 5e8930c..b57107d 100644 --- a/Makefile +++ b/Makefile @@ -114,12 +114,13 @@ dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp) dtc_cpp_flags = -Wp,-MD,$(depfile).pre.tmp -nostdinc \ -Iinclude -I$(src) -Itestcase-data \ + -Icommon \ -undef -D__DTS__ quiet_cmd_dtc = DTC $@ cmd_dtc = $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \ $(DTC) -O dtb -o $@ -b 0 \ - -i $(src) $(DTC_FLAGS) \ + -i $(src) -i common $(DTC_FLAGS) \ -d $(depfile).dtc.tmp $(dtc-tmp) ; \ cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) diff --git a/scripts/rewrite-paths.sed b/scripts/rewrite-paths.sed index b73fbce..5269769 100644 --- a/scripts/rewrite-paths.sed +++ b/scripts/rewrite-paths.sed @@ -33,6 +33,7 @@ s,\tarch/\([^/]*\)/boot/dts/\(.*\.h\)$,\tsrc/\1/\2,gp # Also rewrite the DTS include paths for dtc+cpp support s,\tarch/\([^/]*\)/include/dts/,\tsrc/\1/include/,gp s,\tinclude/dt-bindings/,\tinclude/dt-bindings/,gp +s,\tkernel/dts/,\tcommon/,gp # Rewrite the bindings subdirectory s,\tDocumentation/devicetree/bindings/,\tBindings/,gp