Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc37374b authored by Hongtao Jia's avatar Hongtao Jia Committed by Scott Wood
Browse files

powerpc/fsl: 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".

Please add "fsl/" prefix when you make dtb using Makefile.

Signed-off-by: default avatarJia Hongtao <hongtao.jia@freescale.com>
[scottwood: fixed cuImage rule]
Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
parent 2d80f651

arch/powerpc/boot/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -364,6 +364,9 @@ $(obj)/cuImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits) 
$(obj)/cuImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)

	$(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb)



$(obj)/cuImage.%: vmlinux $(obj)/fsl/%.dtb $(wrapperbits)

	$(call if_changed,wrap,cuboot-$*,,$(obj)/fsl/$*.dtb)



$(obj)/simpleImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)

	$(call if_changed,wrap,simpleboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)

arch/powerpc/boot/dts/b4420qds.dts→arch/powerpc/boot/dts/fsl/b4420qds.dts

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
 * this software, even if advised of the possibility of such damage.

 */



/include/ "fsl/b4420si-pre.dtsi"

/include/ "b4420si-pre.dtsi"

/include/ "b4qds.dtsi"



/ {
@@ -47,4 +47,4 @@ 


};



/include/ "fsl/b4420si-post.dtsi"
 
/include/ "b4420si-post.dtsi"

arch/powerpc/boot/dts/b4860qds.dts→arch/powerpc/boot/dts/fsl/b4860qds.dts

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



/include/ "fsl/b4860si-pre.dtsi"

/include/ "b4860si-pre.dtsi"

/include/ "b4qds.dtsi"



/ {
@@ -58,4 +58,4 @@ 


};



/include/ "fsl/b4860si-post.dtsi"
 
/include/ "b4860si-post.dtsi"

arch/powerpc/boot/dts/b4qds.dtsi→arch/powerpc/boot/dts/fsl/b4qds.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -229,4 +229,4 @@ 


};



/include/ "fsl/b4si-post.dtsi"
 
/include/ "b4si-post.dtsi"

arch/powerpc/boot/dts/bsc9131rdb.dts→arch/powerpc/boot/dts/fsl/bsc9131rdb.dts

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 * option) any later version.

 */



/include/ "fsl/bsc9131si-pre.dtsi"

/include/ "bsc9131si-pre.dtsi"



/ {

	model = "fsl,bsc9131rdb";
@@ -31,4 +31,4 @@ 
};



/include/ "bsc9131rdb.dtsi"

/include/ "fsl/bsc9131si-post.dtsi"
 
/include/ "bsc9131si-post.dtsi"