correct dts file for targets

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

16 files changed, 24 insertions, 18 deletions

diff --git a/conf/machine/mpc8548cds.conf b/conf/machine/mpc8548cds.conf
index 0d0dcf1..821aac0 100644
--- a/conf/machine/mpc8548cds.conf
+++ b/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/conf/machine/p1020mbg.conf b/conf/machine/p1020mbg.conf
index f2b9eaf..da62c43 100644
--- a/conf/machine/p1020mbg.conf
+++ b/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/conf/machine/p1020rdb.conf b/conf/machine/p1020rdb.conf
index 80d113e..653533c 100644
--- a/conf/machine/p1020rdb.conf
+++ b/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/conf/machine/p1020utm.conf b/conf/machine/p1020utm.conf
index 98b8ef3..7929841 100644
--- a/conf/machine/p1020utm.conf
+++ b/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/conf/machine/p1021rdb.conf b/conf/machine/p1021rdb.conf
index 6da8ef3..8e80752 100644
--- a/conf/machine/p1021rdb.conf
+++ b/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/conf/machine/p1022ds.conf b/conf/machine/p1022ds.conf
index 7c18070..388417e 100644
--- a/conf/machine/p1022ds.conf
+++ b/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-xf86-lite"
diff --git a/conf/machine/p1024rdb.conf b/conf/machine/p1024rdb.conf
index aa6b22f..1a7e315 100644
--- a/conf/machine/p1024rdb.conf
+++ b/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/conf/machine/p1025rdb.conf b/conf/machine/p1025rdb.conf
index 27e3fa4..bcb167e 100644
--- a/conf/machine/p1025rdb.conf
+++ b/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/conf/machine/p2020rdb.conf b/conf/machine/p2020rdb.conf
index 976134a..188a6f2 100644
--- a/conf/machine/p2020rdb.conf
+++ b/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/conf/machine/p2041rdb.conf b/conf/machine/p2041rdb.conf
index 7ec7dfe..e161459 100644
--- a/conf/machine/p2041rdb.conf
+++ b/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/conf/machine/p3041ds.conf b/conf/machine/p3041ds.conf
index 747d563..909761e 100644
--- a/conf/machine/p3041ds.conf
+++ b/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/conf/machine/p4080ds.conf b/conf/machine/p4080ds.conf
index 078774e..6c90912 100644
--- a/conf/machine/p4080ds.conf
+++ b/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/conf/machine/p5020ds-64b.conf b/conf/machine/p5020ds-64b.conf
index 1d16985..e946076 100644
--- a/conf/machine/p5020ds-64b.conf
+++ b/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/conf/machine/p5020ds.conf b/conf/machine/p5020ds.conf
index 10cbe81..3a5c672 100644
--- a/conf/machine/p5020ds.conf
+++ b/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/conf/machine/p5040ds-64b.conf b/conf/machine/p5040ds-64b.conf
index a0c5637..1560420 100644
--- a/conf/machine/p5040ds-64b.conf
+++ b/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/conf/machine/p5040ds.conf b/conf/machine/p5040ds.conf
index 09634bc..f3719c6 100644
--- a/conf/machine/p5040ds.conf
+++ b/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"