[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <19050561.IRVkypnnKH@wuerfel>
Date: Wed, 14 Oct 2015 17:56:27 +0200
From: Arnd Bergmann <arnd@...db.de>
To: linux-arm-kernel@...ts.infradead.org
Cc: Mark Rutland <mark.rutland@....com>,
Ian Campbell <ian.campbell@...rix.com>,
devicetree@...r.kernel.org,
Lorenzo Pieralisi <lorenzo.pieralisi@....com>,
Russell King <linux@....linux.org.uk>, arm@...nel.org,
Pawel Moll <pawel.moll@....com>, linux-kbuild@...r.kernel.org,
Catalin Marinas <catalin.marinas@....com>,
Kumar Gala <galak@...eaurora.org>,
Liviu Dudau <liviu.dudau@....com>,
linux-kernel@...r.kernel.org, Will Deacon <will.deacon@....com>,
Rob Herring <robh+dt@...nel.org>,
Kristina Martsenko <kristina.martsenko@....com>,
Frank Rowand <frank.rowand@...ymobile.com>,
Sudeep Holla <sudeep.holla@....com>,
Olof Johansson <olof@...om.net>,
Kevin Hilman <khilman@...aro.org>
Subject: Re: [PATCH] ARM64: dts: vexpress: Use a symlink to vexpress-v2m-rs1.dtsi from arch=arm
On Monday 12 October 2015 16:37:50 Mark Rutland wrote:
> On Mon, Oct 05, 2015 at 12:53:52PM +0100, Ian Campbell wrote:
> > 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.
> >
> > Previously I attempted to resolve this by creating a shared location
> > for such things but we have been unable to come to a consensus on
> > where that should be.
> >
> > Instead this patch simply replaces the use of ../../ in the dts
> > /include/ with a symlink in arch/arm64/boot/dts/arm pointing to the
> > file arch/arm/boot/dts.
> >
> > Since the split device tree repo will shortly be required to flatten
> > symlinks for other reasons this will cause the dtsi file to appear in
> > both src/arm and src/arm64 in the split repo, which is an improvement
> > on not building for arm64 now.
> >
> > [0] https://git.kernel.org/cgit/linux/kernel/git/devicetree/devicetree-rebasing.git/
> >
> > Signed-off-by: Ian Campbell <ian.campbell@...rix.com>
> Acked-by: Mark Rutland <mark.rutland@....com>
>
Applied to next/dt, thanks!
Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists