From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752098AbcJCF51 (ORCPT ); Mon, 3 Oct 2016 01:57:27 -0400 Received: from mail-pa0-f65.google.com ([209.85.220.65]:36814 "EHLO mail-pa0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752479AbcJCF5T (ORCPT ); Mon, 3 Oct 2016 01:57:19 -0400 Date: Sun, 2 Oct 2016 22:57:14 -0700 From: Olof Johansson To: Ian Campbell Cc: linux-arm-kernel@lists.infradead.org, arm@kernel.org, Arnd Bergmann , Catalin Marinas , Will Deacon , Mark Rutland , Rob Herring , Frank Rowand , Eric Anholt , Stephen Warren , Lee Jones , Gerd Hoffmann , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rpi-kernel@lists.infradead.org Subject: Re: [PATCH v3 2/2] ARM64: dts: bcm: Use a symlink to R-Pi dtsi files from arch=arm Message-ID: <20161003055714.GA12261@localhost> References: <1471516926-11466-1-git-send-email-ijc@hellion.org.uk> <1471516926-11466-2-git-send-email-ijc@hellion.org.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1471516926-11466-2-git-send-email-ijc@hellion.org.uk> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Aug 18, 2016 at 11:42:06AM +0100, Ian Campbell wrote: > The ../../../arm... style cross-references added by commit 9d56c22a7861 > ("ARM: bcm2835: Add devicetree for the Raspberry Pi 3.") do not work in the > context of the split device-tree repository[0] (where the directory > structure differs). As with commit 8ee57b8182c4 ("ARM64: dts: vexpress: Use > a symlink to vexpress-v2m-rs1.dtsi from arch=arm") use symlinks instead. > > [0] https://git.kernel.org/cgit/linux/kernel/git/devicetree/devicetree-rebasing.git/ > > Signed-off-by: Ian Campbell > Acked-by: Mark Rutland > Cc: Catalin Marinas > Cc: Will Deacon > Cc: Mark Rutland > Cc: Rob Herring > Cc: Frank Rowand > Cc: Eric Anholt > Cc: Stephen Warren > Cc: Lee Jones > Cc: Gerd Hoffmann > Cc: devicetree@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-rpi-kernel@lists.infradead.org > Cc: arm@kernel.org > --- > v2: No more need for skeleton.dtsi since this was cleaned up in the previous > patch > v3: Collected tags Hi, I still think this is fundamentally the wrong approach. We shouldn't have created these file links in the first place. I'd rather have something like this in our tree: arch/arm64/boot/dts/include/arm -> ../../../../arm/boot/dts arch/arm64/boot/dts/include/arm64 -> ../.. arch/arm/boot/dts/include/arm64 -> ../../../../arm64/boot/dts arch/arm/boot/dts/include/arm -> ../.. That way you can include by using instead. You'll populate another (or the same) directory with links as appropriate in your out-of-tree version of the DT contents. No more symlinked files, and still a clear way of showing that you're referencing contents out of the other architecture. Considerably cleaner, isn't it? -Olof From mboxrd@z Thu Jan 1 00:00:00 1970 From: olof@lixom.net (Olof Johansson) Date: Sun, 2 Oct 2016 22:57:14 -0700 Subject: [PATCH v3 2/2] ARM64: dts: bcm: Use a symlink to R-Pi dtsi files from arch=arm In-Reply-To: <1471516926-11466-2-git-send-email-ijc@hellion.org.uk> References: <1471516926-11466-1-git-send-email-ijc@hellion.org.uk> <1471516926-11466-2-git-send-email-ijc@hellion.org.uk> Message-ID: <20161003055714.GA12261@localhost> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Thu, Aug 18, 2016 at 11:42:06AM +0100, Ian Campbell wrote: > The ../../../arm... style cross-references added by commit 9d56c22a7861 > ("ARM: bcm2835: Add devicetree for the Raspberry Pi 3.") do not work in the > context of the split device-tree repository[0] (where the directory > structure differs). As with commit 8ee57b8182c4 ("ARM64: dts: vexpress: Use > a symlink to vexpress-v2m-rs1.dtsi from arch=arm") use symlinks instead. > > [0] https://git.kernel.org/cgit/linux/kernel/git/devicetree/devicetree-rebasing.git/ > > Signed-off-by: Ian Campbell > Acked-by: Mark Rutland > Cc: Catalin Marinas > Cc: Will Deacon > Cc: Mark Rutland > Cc: Rob Herring > Cc: Frank Rowand > Cc: Eric Anholt > Cc: Stephen Warren > Cc: Lee Jones > Cc: Gerd Hoffmann > Cc: devicetree at vger.kernel.org > Cc: linux-kernel at vger.kernel.org > Cc: linux-arm-kernel at lists.infradead.org > Cc: linux-rpi-kernel at lists.infradead.org > Cc: arm at kernel.org > --- > v2: No more need for skeleton.dtsi since this was cleaned up in the previous > patch > v3: Collected tags Hi, I still think this is fundamentally the wrong approach. We shouldn't have created these file links in the first place. I'd rather have something like this in our tree: arch/arm64/boot/dts/include/arm -> ../../../../arm/boot/dts arch/arm64/boot/dts/include/arm64 -> ../.. arch/arm/boot/dts/include/arm64 -> ../../../../arm64/boot/dts arch/arm/boot/dts/include/arm -> ../.. That way you can include by using instead. You'll populate another (or the same) directory with links as appropriate in your out-of-tree version of the DT contents. No more symlinked files, and still a clear way of showing that you're referencing contents out of the other architecture. Considerably cleaner, isn't it? -Olof