[meta-freescale] [meta-freescale-layer][PATCH 25/67] t4240: update dtb path

ting.liu at nxp.com ting.liu at nxp.com
Mon Jul 4 03:41:43 PDT 2016


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

Signed-off-by: Ting Liu <ting.liu at nxp.com>
---
 conf/machine/t4240qds-64b.conf | 12 ++++--------
 conf/machine/t4240qds.conf     | 12 ++++--------
 conf/machine/t4240rdb-64b.conf | 10 +++-------
 conf/machine/t4240rdb.conf     | 10 +++-------
 4 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/conf/machine/t4240qds-64b.conf b/conf/machine/t4240qds-64b.conf
index 911c155..6f31593 100644
--- a/conf/machine/t4240qds-64b.conf
+++ b/conf/machine/t4240qds-64b.conf
@@ -9,20 +9,16 @@ require conf/machine/include/e6500-64b.inc
 
 SOC_FAMILY = "t4:t4240"
 
-UBOOT_CONFIG ??= "nor secure-boot"
+UBOOT_CONFIG ??= "secure-boot nor"
 UBOOT_CONFIG[nor] = "T4240QDS_config"
 UBOOT_CONFIG[secure-boot] = "T4240QDS_SECURE_BOOT_config"
 
-
-HV_CFG_M = "t4240qds"
-
-KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb \
-    t4240qds-usdpaa-shared-interfaces.dtb \
+KERNEL_DEVICETREE ?= "fsl/t4240qds.dtb fsl/t4240qds-usdpaa.dtb \
+    fsl/t4240qds-usdpaa-shared-interfaces.dtb \
 "
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
+HV_CFG_M = "t4240qds"
 JFFS2_ERASEBLOCK = "0x10000"
-
 EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
-
 USE_VT ?= "0"
diff --git a/conf/machine/t4240qds.conf b/conf/machine/t4240qds.conf
index 0eff892..1e72c51 100644
--- a/conf/machine/t4240qds.conf
+++ b/conf/machine/t4240qds.conf
@@ -9,20 +9,16 @@ require conf/machine/include/e6500.inc
 
 SOC_FAMILY = "t4:t4240"
 
-UBOOT_CONFIG ??= "nor secure-boot"
+UBOOT_CONFIG ??= "secure-boot nor"
 UBOOT_CONFIG[nor] = "T4240QDS_config"
 UBOOT_CONFIG[secure-boot] = "T4240QDS_SECURE_BOOT_config"
 
-
-HV_CFG_M = "t4240qds"
-
-KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb \
-    t4240qds-usdpaa-shared-interfaces.dtb \
+KERNEL_DEVICETREE ?= "fsl/t4240qds.dtb fsl/t4240qds-usdpaa.dtb \
+    fsl/t4240qds-usdpaa-shared-interfaces.dtb \
 "
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
+HV_CFG_M = "t4240qds"
 JFFS2_ERASEBLOCK = "0x10000"
-
 EXTRA_IMAGEDEPENDS += "fm-ucode rcw lib64-hypervisor hv-cfg"
-
 USE_VT ?= "0"
diff --git a/conf/machine/t4240rdb-64b.conf b/conf/machine/t4240rdb-64b.conf
index 14420dc..432a45a 100644
--- a/conf/machine/t4240rdb-64b.conf
+++ b/conf/machine/t4240rdb-64b.conf
@@ -12,16 +12,12 @@ SOC_FAMILY = "t4:t4240"
 UBOOT_CONFIG ??= "nor"
 UBOOT_CONFIG[nor] = "T4240RDB_config"
 
-
-HV_CFG_M = "t4240rdb"
-
-KERNEL_DEVICETREE ?= "t4240rdb.dtb t4240rdb-usdpaa.dtb \
-    t4240rdb-usdpaa-shared-interfaces.dtb \
+KERNEL_DEVICETREE ?= "fsl/t4240rdb.dtb fsl/t4240rdb-usdpaa.dtb \
+    fsl/t4240rdb-usdpaa-shared-interfaces.dtb \
 "
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
+HV_CFG_M = "t4240rdb"
 JFFS2_ERASEBLOCK = "0x10000"
-
 EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
-
 USE_VT ?= "0"
diff --git a/conf/machine/t4240rdb.conf b/conf/machine/t4240rdb.conf
index 9633a67..9bc472b 100644
--- a/conf/machine/t4240rdb.conf
+++ b/conf/machine/t4240rdb.conf
@@ -12,16 +12,12 @@ SOC_FAMILY = "t4:t4240"
 UBOOT_CONFIG ??= "nor"
 UBOOT_CONFIG[nor] = "T4240RDB_config"
 
-
-HV_CFG_M = "t4240rdb"
-
-KERNEL_DEVICETREE ?= "t4240rdb.dtb t4240rdb-usdpaa.dtb \
-    t4240rdb-usdpaa-shared-interfaces.dtb \
+KERNEL_DEVICETREE ?= "fsl/t4240rdb.dtb fsl/t4240rdb-usdpaa.dtb \
+    fsl/t4240rdb-usdpaa-shared-interfaces.dtb \
 "
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
+HV_CFG_M = "t4240rdb"
 JFFS2_ERASEBLOCK = "0x10000"
-
 EXTRA_IMAGEDEPENDS += "fm-ucode rcw lib64-hypervisor hv-cfg"
-
 USE_VT ?= "0"
-- 
1.9.2



More information about the meta-freescale mailing list