[meta-freescale] [meta-freescale-layer][PATCH 22/67] t104x: update dtb path

[ting.liu at nxp.com]

From: Ting Liu <ting.liu at nxp.com>

* add dsar dtb

Signed-off-by: Ting Liu <ting.liu at nxp.com>
---
 conf/machine/t1040d4rdb-64b.conf | 14 +++++---------
 conf/machine/t1040d4rdb.conf     | 14 +++++---------
 conf/machine/t1042d4rdb-64b.conf | 14 +++++---------
 conf/machine/t1042d4rdb.conf     | 14 +++++---------
 4 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/conf/machine/t1040d4rdb-64b.conf b/conf/machine/t1040d4rdb-64b.conf
index 4ffeed6..dece0f5 100644
--- a/conf/machine/t1040d4rdb-64b.conf
+++ b/conf/machine/t1040d4rdb-64b.conf
@@ -9,25 +9,21 @@ require conf/machine/include/e5500-64b.inc
 
 SOC_FAMILY = "t1:t1040"
 
-UBOOT_CONFIG ??= "nor nand sdcard spi secure-boot"
+UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor"
 UBOOT_CONFIG[nor] = "T1040D4RDB_config"
 UBOOT_CONFIG[nand] = "T1040D4RDB_NAND_config"
 UBOOT_CONFIG[sdcard] = "T1040D4RDB_SDCARD_config"
 UBOOT_CONFIG[spi] = "T1040D4RDB_SPIFLASH_config"
 UBOOT_CONFIG[secure-boot] = "T1040D4RDB_SECURE_BOOT_config"
 
-
-HV_CFG_M = "t1040rdb"
-
-KERNEL_DEVICETREE ?= "t1040d4rdb.dtb t1040d4rdb-usdpaa.dtb \
-    t1040d4rdb-usdpaa-lag.dtb t1040d4rdb-usdpaa-shared-interfaces.dtb \
+KERNEL_DEVICETREE ?= "fsl/t1040d4rdb.dtb fsl/t1040d4rdb-usdpaa.dtb \
+    fsl/t1040d4rdb-dsar.dtb \
+    fsl/t1040d4rdb-usdpaa-lag.dtb fsl/t1040d4rdb-usdpaa-shared-interfaces.dtb \
 "
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3l_smp_defconfig"
 
+HV_CFG_M = "t1040rdb"
 JFFS2_ERASEBLOCK = "0x10000"
-
 QE_UCODE = "iram_Type_A_T1040_r1.0.bin"
-
 EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg qe-ucode"
-
 USE_VT ?= "0"
diff --git a/conf/machine/t1040d4rdb.conf b/conf/machine/t1040d4rdb.conf
index 50961bb..3e8c670 100644
--- a/conf/machine/t1040d4rdb.conf
+++ b/conf/machine/t1040d4rdb.conf
@@ -9,25 +9,21 @@ require conf/machine/include/e5500.inc
 
 SOC_FAMILY = "t1:t1040"
 
-UBOOT_CONFIG ??= "nor nand sdcard spi secure-boot"
+UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor"
 UBOOT_CONFIG[nor] = "T1040D4RDB_config"
 UBOOT_CONFIG[nand] = "T1040D4RDB_NAND_config"
 UBOOT_CONFIG[sdcard] = "T1040D4RDB_SDCARD_config"
 UBOOT_CONFIG[spi] = "T1040D4RDB_SPIFLASH_config"
 UBOOT_CONFIG[secure-boot] = "T1040D4RDB_SECURE_BOOT_config"
 
-
-HV_CFG_M = "t1040rdb"
-
-KERNEL_DEVICETREE ?= "t1040d4rdb.dtb t1040d4rdb-usdpaa.dtb \
-    t1040d4rdb-usdpaa-lag.dtb t1040d4rdb-usdpaa-shared-interfaces.dtb \
+KERNEL_DEVICETREE ?= "fsl/t1040d4rdb.dtb fsl/t1040d4rdb-usdpaa.dtb \
+    fsl/t1040d4rdb-dsar.dtb \
+    fsl/t1040d4rdb-usdpaa-lag.dtb fsl/t1040d4rdb-usdpaa-shared-interfaces.dtb \
 "
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3l_smp_defconfig"
 
+HV_CFG_M = "t1040rdb"
 JFFS2_ERASEBLOCK = "0x10000"
-
 QE_UCODE = "iram_Type_A_T1040_r1.0.bin"
-
 EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg qe-ucode"
-
 USE_VT ?= "0"
diff --git a/conf/machine/t1042d4rdb-64b.conf b/conf/machine/t1042d4rdb-64b.conf
index b73273f..9e39566 100644
--- a/conf/machine/t1042d4rdb-64b.conf
+++ b/conf/machine/t1042d4rdb-64b.conf
@@ -9,25 +9,21 @@ require conf/machine/include/e5500-64b.inc
 
 SOC_FAMILY = "t1:t1042"
 
-UBOOT_CONFIG ??= "nor nand sdcard spi secure-boot"
+UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor"
 UBOOT_CONFIG[nor] = "T1042D4RDB_config"
 UBOOT_CONFIG[nand] = "T1042D4RDB_NAND_config"
 UBOOT_CONFIG[sdcard] = "T1042D4RDB_SDCARD_config"
 UBOOT_CONFIG[spi] = "T1042D4RDB_SPIFLASH_config"
 UBOOT_CONFIG[secure-boot] = "T1042D4RDB_SECURE_BOOT_config"
 
-
-HV_CFG_M = "t1040rdb"
-
-KERNEL_DEVICETREE ?= "t1042d4rdb.dtb t1042d4rdb-usdpaa.dtb \
-    t1042d4rdb-usdpaa-shared-interfaces.dtb \
+KERNEL_DEVICETREE ?= "fsl/t1042d4rdb.dtb fsl/t1042d4rdb-usdpaa.dtb \
+    fsl/t1042d4rdb-dsar.dtb \
+    fsl/t1042d4rdb-usdpaa-shared-interfaces.dtb \
 "
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3l_smp_defconfig"
 
+HV_CFG_M = "t1040rdb"
 JFFS2_ERASEBLOCK = "0x10000"
-
 QE_UCODE = "iram_Type_A_T1040_r1.0.bin"
-
 EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg qe-ucode"
-
 USE_VT ?= "0"
diff --git a/conf/machine/t1042d4rdb.conf b/conf/machine/t1042d4rdb.conf
index 3f496fb..0288ae1 100644
--- a/conf/machine/t1042d4rdb.conf
+++ b/conf/machine/t1042d4rdb.conf
@@ -9,25 +9,21 @@ require conf/machine/include/e5500.inc
 
 SOC_FAMILY = "t1:t1042"
 
-UBOOT_CONFIG ??= "nor nand sdcard spi secure-boot"
+UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor"
 UBOOT_CONFIG[nor] = "T1042D4RDB_config"
 UBOOT_CONFIG[nand] = "T1042D4RDB_NAND_config"
 UBOOT_CONFIG[sdcard] = "T1042D4RDB_SDCARD_config"
 UBOOT_CONFIG[spi] = "T1042D4RDB_SPIFLASH_config"
 UBOOT_CONFIG[secure-boot] = "T1042D4RDB_SECURE_BOOT_config"
 
-
-HV_CFG_M = "t1040rdb"
-
-KERNEL_DEVICETREE ?= "t1042d4rdb.dtb t1042d4rdb-usdpaa.dtb \
-    t1042d4rdb-usdpaa-shared-interfaces.dtb \
+KERNEL_DEVICETREE ?= "fsl/t1042d4rdb.dtb fsl/t1042d4rdb-usdpaa.dtb \
+    fsl/t1042d4rdb-dsar.dtb \
+    fsl/t1042d4rdb-usdpaa-shared-interfaces.dtb \
 "
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3l_smp_defconfig"
 
+HV_CFG_M = "t1040rdb"
 JFFS2_ERASEBLOCK = "0x10000"
-
 QE_UCODE = "iram_Type_A_T1040_r1.0.bin"
-
 EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg qe-ucode"
-
 USE_VT ?= "0"
-- 
1.9.2