From: Arnd Bergmann <arnd@arndb.de>
To: linux-arm-kernel@lists.infradead.org
Cc: Mark Rutland <mark.rutland@arm.com>,
Ian Campbell <ian.campbell@citrix.com>,
devicetree@vger.kernel.org,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Russell King <linux@arm.linux.org.uk>,
arm@kernel.org, Pawel Moll <pawel.moll@arm.com>,
linux-kbuild@vger.kernel.org,
Catalin Marinas <catalin.marinas@arm.com>,
Kumar Gala <galak@codeaurora.org>,
Liviu Dudau <liviu.dudau@arm.com>,
linux-kernel@vger.kernel.org, Will Deacon <will.deacon@arm.com>,
Rob Herring <robh+dt@kernel.org>,
Kristina Martsenko <kristina.martsenko@arm.com>,
Frank Rowand <frank.rowand@sonymobile.com>,
Sudeep Holla <sudeep.holla@arm.com>,
Olof Johansson <olof@lixom.net>,
Kevin Hilman <khilman@linaro.org>
Subject: Re: [PATCH] ARM64: dts: vexpress: Use a symlink to vexpress-v2m-rs1.dtsi from arch=arm
Date: Wed, 14 Oct 2015 17:56:27 +0200 [thread overview]
Message-ID: <19050561.IRVkypnnKH@wuerfel> (raw)
In-Reply-To: <20151012153750.GE7452@leverpostej>
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@citrix.com>
> Acked-by: Mark Rutland <mark.rutland@arm.com>
>
Applied to next/dt, thanks!
Arnd
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM64: dts: vexpress: Use a symlink to vexpress-v2m-rs1.dtsi from arch=arm
Date: Wed, 14 Oct 2015 17:56:27 +0200 [thread overview]
Message-ID: <19050561.IRVkypnnKH@wuerfel> (raw)
In-Reply-To: <20151012153750.GE7452@leverpostej>
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@citrix.com>
> Acked-by: Mark Rutland <mark.rutland@arm.com>
>
Applied to next/dt, thanks!
Arnd
next prev parent reply other threads:[~2015-10-14 15:57 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-05 11:53 [PATCH] ARM64: dts: vexpress: Use a symlink to vexpress-v2m-rs1.dtsi from arch=arm Ian Campbell
2015-10-05 11:53 ` Ian Campbell
2015-10-05 11:53 ` Ian Campbell
2015-10-12 13:04 ` Ian Campbell
2015-10-12 13:04 ` Ian Campbell
2015-10-12 13:04 ` Ian Campbell
2015-10-12 15:07 ` Catalin Marinas
2015-10-12 15:07 ` Catalin Marinas
2015-10-12 15:37 ` Mark Rutland
2015-10-12 15:37 ` Mark Rutland
2015-10-14 2:14 ` Masahiro Yamada
2015-10-14 2:14 ` Masahiro Yamada
2015-10-14 15:56 ` Arnd Bergmann [this message]
2015-10-14 15:56 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=19050561.IRVkypnnKH@wuerfel \
--to=arnd@arndb.de \
--cc=arm@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=frank.rowand@sonymobile.com \
--cc=galak@codeaurora.org \
--cc=ian.campbell@citrix.com \
--cc=khilman@linaro.org \
--cc=kristina.martsenko@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=liviu.dudau@arm.com \
--cc=lorenzo.pieralisi@arm.com \
--cc=mark.rutland@arm.com \
--cc=olof@lixom.net \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
--cc=sudeep.holla@arm.com \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.