correct dts file for targets

Signed-off-by: Zhenhua Luo <b19537@freescale.com>

diff --git a/meta-fsl-ppc/conf/machine/mpc8548cds.conf b/meta-fsl-ppc/conf/machine/mpc8548cds.conf
index 0d0dcf186b261d7f1c6c8bea2caa054b07c69710..821aac0e5923fa5dcc9959a984a916c536e48568 100644 (file)
--- a/meta-fsl-ppc/conf/machine/mpc8548cds.conf
+++ b/meta-fsl-ppc/conf/machine/mpc8548cds.conf
@@ -5,7 +5,7 @@
 require e500v2.inc
 
 UBOOT_MACHINES = "MPC8548CDS"
-KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/mpc8548cds.dts"
+KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/mpc8548cds_32b.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"

diff --git a/meta-fsl-ppc/conf/machine/p1020mbg.conf b/meta-fsl-ppc/conf/machine/p1020mbg.conf
index f2b9eafdb8f44dda0e9755a86d68ed4eeb5cb3db..da62c432dbeeeafaea5856275e7174298adc0a2e 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1020mbg.conf
+++ b/meta-fsl-ppc/conf/machine/p1020mbg.conf
@@ -6,7 +6,7 @@ require e500v2.inc
 
 BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_800M.dat"
 UBOOT_MACHINES = "P1020MBG-PC P1020MBG-PC_SDCARD P1020MBG-PC_36BIT P1020MBG-PC_36BIT_SDCARD"
-KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1020mbg.dts"
+KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1020mbg-pc_32b.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"

diff --git a/meta-fsl-ppc/conf/machine/p1020rdb.conf b/meta-fsl-ppc/conf/machine/p1020rdb.conf
index 80d113e2d90ec12f8a9702c25f1bd6993b185d7d..653533cfd6b932cb4ab27006b117d5fe76d4bc81 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1020rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1020rdb.conf
@@ -6,7 +6,8 @@ require e500v2.inc
 BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_800M.dat"
 UBOOT_MACHINES = " P1020RDB-PC P1020RDB-PC_SPIFLASH P1020RDB-PC_NAND P1020RDB-PC_SDCARD P1020RDB-PC_36BIT P1020RDB-PC_36BIT_SPIFLASH P1020RDB-PC_36BIT_NAND P1020RDB-PC_36BIT_SDCARD"
 
-KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1020rdb.dts"
+KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1020rdb-pc_32b.dts"
+
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"

diff --git a/meta-fsl-ppc/conf/machine/p1020utm.conf b/meta-fsl-ppc/conf/machine/p1020utm.conf
index 98b8ef36234021d70c8635cb736e8f933669bcf4..79298413cb662faa1668f78813861e5d7ea81fb7 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1020utm.conf
+++ b/meta-fsl-ppc/conf/machine/p1020utm.conf
@@ -6,7 +6,7 @@ require e500v2.inc
 
 BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_800M.dat"
 UBOOT_MACHINES = "P1020UTM-PC P1020UTM-PC_SDCARD P1020UTM-PC_36BIT P1020UTM-PC_36BIT_SDCARD"
-KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1020utm.dts"
+KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1020utm-pc_32b.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"

diff --git a/meta-fsl-ppc/conf/machine/p1021rdb.conf b/meta-fsl-ppc/conf/machine/p1021rdb.conf
index 6da8ef3b339f8f3cdfa0a394ccbae368f09af0dc..8e8075206797efc186df2952287cc020aa1c48f2 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1021rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1021rdb.conf
@@ -5,7 +5,7 @@
 require e500v2.inc
 BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_800M.dat"
 UBOOT_MACHINES = "P1021RDB-PC P1021RDB-PC_NAND P1021RDB-PC_SDCARD P1021RDB-PC_SPIFLASH P1021RDB-PC_36BIT P1021RDB-PC_36BIT_SPIFLASH P1021RDB-PC_36BIT_NAND P1021RDB-PC_36BIT_SDCARD"
-KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1021rdb.dts"
+KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1021rdb-pc_32b.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"

diff --git a/meta-fsl-ppc/conf/machine/p1022ds.conf b/meta-fsl-ppc/conf/machine/p1022ds.conf
index 8a50bec96b0aa1b1c06f7386a6beaca4462d9d48..1f15303cffbf5314d7b72f3a7d8982e401fc5ee7 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1022ds.conf
+++ b/meta-fsl-ppc/conf/machine/p1022ds.conf
@@ -5,7 +5,7 @@ require e500v2.inc
 
 BOOTFORMAT_CONFIG = "config_ddr3_2gb_p1022ds.dat"
 UBOOT_MACHINES = "P1022DS P1022DS_NAND P1022DS_SPIFLASH P1022DS_SDCARD P1022DS_36BIT P1022DS_36BIT_SPIFLASH P1022DS_36BIT_NAND P1022DS_36BIT_SDCARD"
-KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1022ds.dts"
+KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1022ds_32b.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg-lite"

diff --git a/meta-fsl-ppc/conf/machine/p1024rdb.conf b/meta-fsl-ppc/conf/machine/p1024rdb.conf
index aa6b22feef19ab75668d6401517f472a900bcb54..1a7e315d384a71200255549a73cdda4b4df1e121 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1024rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1024rdb.conf
@@ -6,7 +6,7 @@ require e500v2.inc
 
 BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_667M.dat"
 UBOOT_MACHINES = "P1024RDB P1024RDB_36BIT P1024RDB_NAND P1024RDB_SDCARD P1024RDB_SPIFLASH"
-KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1024rdb.dts"
+KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1024rdb_32b.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"

diff --git a/meta-fsl-ppc/conf/machine/p1025rdb.conf b/meta-fsl-ppc/conf/machine/p1025rdb.conf
index 27e3fa47589ec95b072f95aa8d386ee70a02a6d7..bcb167ef9fd455c1f3ead0c98c6355147b94b8b6 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1025rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1025rdb.conf
@@ -7,7 +7,7 @@ require e500v2.inc
 
 BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_667M.dat"
 UBOOT_MACHINES = "P1025RDB P1025RDB_36BIT P1025RDB_NAND P1025RDB_SDCARD P1025RDB_SPIFLASH"
-KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1025rdb.dts"
+KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1025rdb_32b.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"

diff --git a/meta-fsl-ppc/conf/machine/p2020rdb.conf b/meta-fsl-ppc/conf/machine/p2020rdb.conf
index 976134aa68346b335bd28d296fece0c18dd1d6af..188a6f2eda464bae8cd1d4180af50c4668faf7aa 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p2020rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p2020rdb.conf
@@ -6,7 +6,7 @@ require e500v2.inc
 
 BOOTFORMAT_CONFIG = "config_ddr3_1gb_64bit_p2020rdb_pc.dat"
 UBOOT_MACHINES = " P2020RDB-PC P2020RDB-PC_NAND P2020RDB-PC_SDCARD P2020RDB-PC_SPIFLASH P2020RDB-PC_36BIT P2020RDB-PC_36BIT_SPIFLASH P2020RDB-PC_36BIT_NAND P2020RDB-PC_36BIT_SDCARD"
-KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p2020rdb.dts"
+KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p2020rdb-pc_32b.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"

diff --git a/meta-fsl-ppc/conf/machine/p2041rdb.conf b/meta-fsl-ppc/conf/machine/p2041rdb.conf
index 7ec7dfe8163e0cfb114f56e30a725e2ba1f0ecff..e16145981e8c5eb56157e31014bc139821cfa074 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p2041rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p2041rdb.conf
@@ -4,7 +4,8 @@
 require e500mc.inc
 
 UBOOT_MACHINES = "P2041RDB P2041RDB_SECURE_BOOT P2041RDB_SDCARD P2041RDB_SPIFLASH"
-KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p2041rdb.dts"
+KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p2041rdb.dts \
+       ${S}/arch/powerpc/boot/dts/p2041rdb-usdpaa.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"

diff --git a/meta-fsl-ppc/conf/machine/p3041ds.conf b/meta-fsl-ppc/conf/machine/p3041ds.conf
index 747d563b6dd6c9d1e6c724b2664578860a71e76c..909761e4b5c4cdf17fd2963fde23ce3219c25f4c 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p3041ds.conf
+++ b/meta-fsl-ppc/conf/machine/p3041ds.conf
@@ -4,7 +4,8 @@
 require e500mc.inc
 
 UBOOT_MACHINES = "P3041DS P3041DS_NAND P3041DS_SECURE_BOOT P3041DS_SDCARD P3041DS_SPIFLASH"
-KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p3041ds.dts"
+KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p3041ds.dts \
+       ${S}/arch/powerpc/boot/dts/p3041ds-usdpaa.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"

diff --git a/meta-fsl-ppc/conf/machine/p4080ds.conf b/meta-fsl-ppc/conf/machine/p4080ds.conf
index 078774e2d738ef7dbbe45c43a816b058fc22e435..6c90912e3c18065b5abe1522873bb7c80251e44e 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p4080ds.conf
+++ b/meta-fsl-ppc/conf/machine/p4080ds.conf
@@ -4,7 +4,8 @@
 require e500mc.inc
 
 UBOOT_MACHINES = "P4080DS P4080DS_SECURE_BOOT P4080DS_SDCARD P4080DS_SPIFLASH "
-KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p4080ds.dts"
+KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p4080ds.dts \
+       ${S}/arch/powerpc/boot/dts/p4080ds-usdpaa.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"

diff --git a/meta-fsl-ppc/conf/machine/p5020ds-64b.conf b/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
index 1d1698576a0fce2559788ebd20d512fd5c95ce68..e946076b0f829ed51b93a924bc2b7c4df35a3f79 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
@@ -5,7 +5,8 @@ require e5500-64b.inc
 
 # TODO: fix 32bit build of u-boot for p5020ds-64b
 UBOOT_MACHINES = "P5020DS"
-KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5020ds.dts"
+KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5020ds.dts \
+       ${S}/arch/powerpc/boot/dts/p5020ds-usdpaa.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"

diff --git a/meta-fsl-ppc/conf/machine/p5020ds.conf b/meta-fsl-ppc/conf/machine/p5020ds.conf
index 10cbe81ce2b45100a25bb0d3c9d5b47b62b5a6e9..3a5c67219bdc2e15a457160c84b96cb4bcec7ca6 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p5020ds.conf
+++ b/meta-fsl-ppc/conf/machine/p5020ds.conf
@@ -4,7 +4,8 @@
 require e5500.inc
 
 UBOOT_MACHINES = "P5020DS P5020DS_NAND P5020DS_SECURE_BOOT P5020DS_SDCARD P5020DS_SPIFLASH "
-KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5020ds.dts"
+KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5020ds.dts \
+       ${S}/arch/powerpc/boot/dts/p5020ds-usdpaa.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"

diff --git a/meta-fsl-ppc/conf/machine/p5040ds-64b.conf b/meta-fsl-ppc/conf/machine/p5040ds-64b.conf
index a0c563756b1849f6d44759ff260322375a93bd13..156042010b996f621bf88b9cf14356e78e19950b 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p5040ds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/p5040ds-64b.conf
@@ -4,9 +4,8 @@
 require e5500-64b.inc
 
 UBOOT_MACHINES = "P5040DS"
-
-KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5040ds.dts "
-
+KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5040ds.dts \
+       ${S}/arch/powerpc/boot/dts/p5040ds-usdpaa.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"

diff --git a/meta-fsl-ppc/conf/machine/p5040ds.conf b/meta-fsl-ppc/conf/machine/p5040ds.conf
index 09634bc68b0c5b5f9e9c90ddca5f2f21f2180404..f3719c6e968d5c8f17ac6c5564820ac20f73f4a0 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p5040ds.conf
+++ b/meta-fsl-ppc/conf/machine/p5040ds.conf
@@ -4,7 +4,8 @@
 require e5500.inc
 
 UBOOT_MACHINES = "P5040DS"
-KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5040ds.dts"
+KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5040ds.dts \
+       ${S}/arch/powerpc/boot/dts/p5040ds-usdpaa.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"