linux-kernel - Re: [PATCH 2/5] ARM: dts: use #include "..." to include DT in the same directory

Open Source and information security mailing list archives

Date:   Mon, 15 May 2017 21:10:49 +0800
From:   Shawn Guo <shawnguo@...nel.org>
To:     Masahiro Yamada <yamada.masahiro@...ionext.com>
Cc:     devicetree@...r.kernel.org,
        linux-arch <linux-arch@...r.kernel.org>,
        Mark Rutland <mark.rutland@....com>,
        linux-kernel@...r.kernel.org, Russell King <linux@...linux.org.uk>,
        Gaurav Minocha <gaurav.minocha.os@...il.com>,
        Olof Johansson <olof@...om.net>,
        Rob Herring <robh+dt@...nel.org>,
        Sascha Hauer <kernel@...gutronix.de>,
        Grant Likely <grant.likely@...aro.org>,
        Omar Sandoval <osandov@...ndov.com>,
        Frank Rowand <frowand.list@...il.com>,
        Fabio Estevam <fabio.estevam@....com>,
        linux-arm-kernel@...ts.infradead.org
Subject: Re: [PATCH 2/5] ARM: dts: use #include "..." to include DT in the
 same directory

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@...ionext.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@...nel.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@...ts.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives