[meta-freescale] [meta-freescale-layer][PATCH 13/67] b4860: update dtb path

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


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

Signed-off-by: Ting Liu <ting.liu at nxp.com>
---
 conf/machine/b4860qds-64b.conf | 13 +++++--------
 conf/machine/b4860qds.conf     | 13 +++++--------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/conf/machine/b4860qds-64b.conf b/conf/machine/b4860qds-64b.conf
index ff99d2a..27518e1 100644
--- a/conf/machine/b4860qds-64b.conf
+++ b/conf/machine/b4860qds-64b.conf
@@ -9,20 +9,17 @@
 require conf/machine/include/e6500-64b.inc
 
 SOC_FAMILY = "b4:b4860"
-UBOOT_CONFIG ??= "nor secure-boot"
+
+UBOOT_CONFIG ??= "secure-boot nor"
 UBOOT_CONFIG[nor] = "B4860QDS_config"
 UBOOT_CONFIG[secure-boot] = "B4860QDS_SECURE_BOOT_config"
 
-
-HV_CFG_M = "b4860qds"
-
-KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb \
-    b4860qds-usdpaa-shared-interfaces.dtb \
+KERNEL_DEVICETREE ?= "fsl/b4860qds.dtb fsl/b4860qds-usdpaa.dtb \
+    fsl/b4860qds-usdpaa-shared-interfaces.dtb \
 "
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
+HV_CFG_M = "b4860qds"
 JFFS2_ERASEBLOCK = "0x10000"
-
 EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
-
 USE_VT ?= "0"
diff --git a/conf/machine/b4860qds.conf b/conf/machine/b4860qds.conf
index 95d3ce8..32acf83 100644
--- a/conf/machine/b4860qds.conf
+++ b/conf/machine/b4860qds.conf
@@ -9,20 +9,17 @@
 require conf/machine/include/e6500.inc
 
 SOC_FAMILY = "b4:b4860"
-UBOOT_CONFIG ??= "nor secure-boot"
+
+UBOOT_CONFIG ??= "secure-boot nor"
 UBOOT_CONFIG[nor] = "B4860QDS_config"
 UBOOT_CONFIG[secure-boot] = "B4860QDS_SECURE_BOOT_config"
 
-
-HV_CFG_M = "b4860qds"
-
-KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb \
-    b4860qds-usdpaa-shared-interfaces.dtb \
+KERNEL_DEVICETREE ?= "fsl/b4860qds.dtb fsl/b4860qds-usdpaa.dtb \
+    fsl/b4860qds-usdpaa-shared-interfaces.dtb \
 "
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
+HV_CFG_M = "b4860qds"
 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