From: shawnguo@kernel.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/5] ARM: dts: use #include "..." to include DT in the same directory
Date: Mon, 15 May 2017 21:10:49 +0800 [thread overview]
Message-ID: <20170515131048.GW8471@dragon> (raw)
In-Reply-To: <1494846888-18966-3-git-send-email-yamada.masahiro@socionext.com>
Hi Masahiro,
On Mon, May 15, 2017 at 08:14:45PM +0900, Masahiro Yamada wrote:
> Most of DT files in ARM use #include "..." to make pre-processor
> include DT in the same directory, but we have 3 exceptional files
> that use #include <...> for that.
>
> They must be fixed to remove -I$(srctree)/arch/$(SRCARCH)/boot/dts
> path from dtc_cpp_flags.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
> arch/arm/boot/dts/imx6q-zii-rdu2.dts | 4 ++--
> arch/arm/boot/dts/imx6qp-zii-rdu2.dts | 4 ++--
I see this patch depends on nothing and can be applied immediately. But
versatile-pb.dts is not really in my charge. In case you want to get
this series merged by arm-soc folks, here is my ACK:
Acked-by: Shawn Guo <shawnguo@kernel.org>
Or you need to split versatile-pb.dts out, and then I can take it.
Shawn
> arch/arm/boot/dts/versatile-pb.dts | 2 +-
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/boot/dts/imx6q-zii-rdu2.dts b/arch/arm/boot/dts/imx6q-zii-rdu2.dts
> index b2d3466..6be8a1e 100644
> --- a/arch/arm/boot/dts/imx6q-zii-rdu2.dts
> +++ b/arch/arm/boot/dts/imx6q-zii-rdu2.dts
> @@ -41,8 +41,8 @@
>
> /dts-v1/;
>
> -#include <imx6q.dtsi>
> -#include <imx6qdl-zii-rdu2.dtsi>
> +#include "imx6q.dtsi"
> +#include "imx6qdl-zii-rdu2.dtsi"
>
> / {
> model = "ZII RDU2 Board";
> diff --git a/arch/arm/boot/dts/imx6qp-zii-rdu2.dts b/arch/arm/boot/dts/imx6qp-zii-rdu2.dts
> index 882b3bd..547a766 100644
> --- a/arch/arm/boot/dts/imx6qp-zii-rdu2.dts
> +++ b/arch/arm/boot/dts/imx6qp-zii-rdu2.dts
> @@ -41,8 +41,8 @@
>
> /dts-v1/;
>
> -#include <imx6qp.dtsi>
> -#include <imx6qdl-zii-rdu2.dtsi>
> +#include "imx6qp.dtsi"
> +#include "imx6qdl-zii-rdu2.dtsi"
>
> / {
> model = "ZII RDU2+ Board";
> diff --git a/arch/arm/boot/dts/versatile-pb.dts b/arch/arm/boot/dts/versatile-pb.dts
> index 33a8eb2..06e2331 100644
> --- a/arch/arm/boot/dts/versatile-pb.dts
> +++ b/arch/arm/boot/dts/versatile-pb.dts
> @@ -1,4 +1,4 @@
> -#include <versatile-ab.dts>
> +#include "versatile-ab.dts"
>
> / {
> model = "ARM Versatile PB";
> --
> 2.7.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2017-05-15 13:10 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-15 11:14 [PATCH 0/5] devicetree: cleanup and improve DT cross-arch reference Masahiro Yamada
2017-05-15 11:14 ` [PATCH 2/5] ARM: dts: use #include "..." to include DT in the same directory Masahiro Yamada
2017-05-15 13:10 ` Shawn Guo [this message]
2017-05-16 11:53 ` Masahiro Yamada
2017-05-24 5:07 ` Masahiro Yamada
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=20170515131048.GW8471@dragon \
--to=shawnguo@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox