RE: [PATCH] PowerPC: Move Freescale device tree files into fsl folder

2015-09-17 Thread Hongtao Jia 
Typo in message.
This patch was superseded.

Please refer to the new one I just sent.

Thanks.

---
Best Regards,
Hongtao


> -Original Message-
> From: Jia Hongtao [mailto:hongtao@freescale.com]
> Sent: Friday, September 18, 2015 11:52 AM
> To: Wood Scott-B07421
> Cc: linuxppc-dev@lists.ozlabs.org; devicet...@vger.kernel.org;
> robh...@kernel.org; Jia Hongtao-B38951
> Subject: [PATCH] PowerPC: Move Freescale device tree files into fsl
> folder
> 
> It makes no sense that some Freescale device tree files are in fsl
> directory while some others not. This patch move Freescale device tree
> files into fsl folder. To do that the following two steps are made:
> - Move Freescale device tree files into fsl folder.
> - Update the include path in these files from "fsl/*.dtsi" to "*.dtsi".
> 
> Plese add "fsl/" prefix when you make dtb using Makefile.
> 
> Signed-off-by: Jia Hongtao 
> ---
>  arch/powerpc/boot/dts/{ => fsl}/b4420qds.dts   | 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/b4860qds.dts   | 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/b4qds.dtsi | 2 +-
>  arch/powerpc/boot/dts/{ => fsl}/bsc9131rdb.dts | 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/bsc9131rdb.dtsi| 0
>  arch/powerpc/boot/dts/{ => fsl}/bsc9132qds.dts | 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/bsc9132qds.dtsi| 0
>  arch/powerpc/boot/dts/{ => fsl}/c293pcie.dts   | 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/ge_imp3a.dts   | 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/kmcoge4.dts| 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/mpc8536ds.dts  | 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/mpc8536ds.dtsi | 0
>  arch/powerpc/boot/dts/{ => fsl}/mpc8536ds_36b.dts  | 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/mpc8540ads.dts | 2 +-
>  arch/powerpc/boot/dts/{ => fsl}/mpc8541cds.dts | 2 +-
>  arch/powerpc/boot/dts/{ => fsl}/mpc8544ds.dts  | 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/mpc8544ds.dtsi | 0
>  arch/powerpc/boot/dts/{ => fsl}/mpc8548cds.dtsi| 0
>  arch/powerpc/boot/dts/{ => fsl}/mpc8548cds_32b.dts | 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/mpc8548cds_36b.dts | 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/mpc8555cds.dts | 2 +-
>  arch/powerpc/boot/dts/{ => fsl}/mpc8560ads.dts | 2 +-
>  arch/powerpc/boot/dts/{ => fsl}/mpc8568mds.dts | 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/mpc8569mds.dts | 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/mpc8572ds.dts  | 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/mpc8572ds.dtsi | 0
>  arch/powerpc/boot/dts/{ => fsl}/mpc8572ds_36b.dts  | 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/mpc8572ds_camp_core0.dts   | 0
>  arch/powerpc/boot/dts/{ => fsl}/mpc8572ds_camp_core1.dts   | 0
>  arch/powerpc/boot/dts/{ => fsl}/mvme2500.dts   | 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/oca4080.dts| 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/p1010rdb-pa.dts| 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/p1010rdb-pa.dtsi   | 0
>  arch/powerpc/boot/dts/{ => fsl}/p1010rdb-pa_36b.dts| 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/p1010rdb-pb.dts| 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/p1010rdb-pb_36b.dts| 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/p1010rdb.dtsi  | 0
>  arch/powerpc/boot/dts/{ => fsl}/p1010rdb_32b.dtsi  | 0
>  arch/powerpc/boot/dts/{ => fsl}/p1010rdb_36b.dtsi  | 0
>  arch/powerpc/boot/dts/{ => fsl}/p1020mbg-pc.dtsi   | 0
>  arch/powerpc/boot/dts/{ => fsl}/p1020mbg-pc_32b.dts| 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/p1020mbg-pc_36b.dts| 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pc.dtsi   | 0
>  arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pc_32b.dts| 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pc_36b.dts| 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pc_camp_core0.dts | 0
>  arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pc_camp_core1.dts | 0
>  arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pd.dts| 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/p1020rdb.dts   | 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/p1020rdb.dtsi  | 0
>  arch/powerpc/boot/dts/{ => fsl}/p1020rdb_36b.dts   | 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/p1020utm-pc.dtsi   | 0
>  arch/powerpc/boot/dts/{ => fsl}/p1020utm-pc_32b.dts| 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/p1020utm-pc_36b.dts| 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/p1021mds.dts   | 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/p1021rdb-pc.dtsi   | 0
>  arch/powerpc/boot/dts/{ => fsl}/p1021rdb-pc_32b.dts| 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/p1021rdb-pc_36b.dts| 4 ++--
>  arch/powerpc/boot/dts/{ => fsl}/p1022ds.dtsi   | 0
>  arch/powerp

Re: [PATCH] PowerPC: Move Freescale device tree files into fsl folder

2015-09-17 Thread Scott Wood 
On Fri, 2015-09-18 at 12:00 +0800, Jia Hongtao wrote:
> It makes no sense that some Freescale device tree files are in fsl
> directory while some others not. This patch move Freescale device tree
> files into fsl folder. To do that the following two steps are made:
> - Move Freescale device tree files into fsl folder.
> - Update the include path in these files from "fsl/*.dtsi" to "*.dtsi".
> 
> Please add "fsl/" prefix when you make dtb using Makefile.

The existing arrangement is indeed a bit odd, but the real reason for this is 
the interaction with the preprocessor.  If a dtsi uses preprocessor 
directives, it needs to be included with #include rather than /include/, or 
else the dtsi won't be preprocessed.  However, if a dtsi is included with 
#include, and that dtsi is in fsl/ but the including dts isn't, any 
/include/s within the dtsi will not search that fsl/ because dtc doesn't 
realize that's the directory the content came from.

There was a desire to include  from 
fsl/t1040si-post.dtsi.  In order to make everything work, we need to either 
move all relevant files to the same directory, or convert all /include/s in 
affected files to #include.

-Scott

___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev