[meta-freescale] [meta-freescale-layer][PATCH 23/67] t2080: update dtb path

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


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

Signed-off-by: Ting Liu <ting.liu at nxp.com>
---
 conf/machine/t2080qds-64b.conf | 12 ++++--------
 conf/machine/t2080qds.conf     | 12 ++++--------
 conf/machine/t2080rdb-64b.conf | 12 ++++--------
 conf/machine/t2080rdb.conf     | 12 ++++--------
 4 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/conf/machine/t2080qds-64b.conf b/conf/machine/t2080qds-64b.conf
index 969f098..3ce7e16 100644
--- a/conf/machine/t2080qds-64b.conf
+++ b/conf/machine/t2080qds-64b.conf
@@ -9,7 +9,7 @@ require conf/machine/include/e6500-64b.inc
 
 SOC_FAMILY = "t2:t2080"
 
-UBOOT_CONFIG ??= "nor sdcard spi nand srio-pcie-boot secure-boot"
+UBOOT_CONFIG ??= "sdcard spi nand srio-pcie-boot secure-boot nor"
 UBOOT_CONFIG[nor] = "T2080QDS_config"
 UBOOT_CONFIG[sdcard] = "T2080QDS_SDCARD_config"
 UBOOT_CONFIG[spi] = "T2080QDS_SPIFLASH_config"
@@ -17,16 +17,12 @@ UBOOT_CONFIG[nand] = "T2080QDS_NAND_config"
 UBOOT_CONFIG[srio-pcie-boot] = "T2080QDS_SRIO_PCIE_BOOT_config"
 UBOOT_CONFIG[secure-boot] = "T2080QDS_SECURE_BOOT_config"
 
-
-HV_CFG_M = "t2080qds"
-
-KERNEL_DEVICETREE ?= "t2080qds.dtb t2080qds-usdpaa.dtb \
-    t2080qds-usdpaa-shared-interfaces.dtb \
+KERNEL_DEVICETREE ?= "fsl/t2080qds.dtb fsl/t2080qds-usdpaa.dtb \
+    fsl/t2080qds-usdpaa-shared-interfaces.dtb \
 "
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
+HV_CFG_M = "t2080qds"
 JFFS2_ERASEBLOCK = "0x10000"
-
 EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
-
 USE_VT ?= "0"
diff --git a/conf/machine/t2080qds.conf b/conf/machine/t2080qds.conf
index c1fab6c..a148679 100644
--- a/conf/machine/t2080qds.conf
+++ b/conf/machine/t2080qds.conf
@@ -9,7 +9,7 @@ require conf/machine/include/e6500.inc
 
 SOC_FAMILY = "t2:t2080"
 
-UBOOT_CONFIG ??= "nor sdcard spi nand srio-pcie-boot secure-boot"
+UBOOT_CONFIG ??= "sdcard spi nand srio-pcie-boot secure-boot nor"
 UBOOT_CONFIG[nor] = "T2080QDS_config"
 UBOOT_CONFIG[sdcard] = "T2080QDS_SDCARD_config"
 UBOOT_CONFIG[spi] = "T2080QDS_SPIFLASH_config"
@@ -17,16 +17,12 @@ UBOOT_CONFIG[nand] = "T2080QDS_NAND_config"
 UBOOT_CONFIG[srio-pcie-boot] = "T2080QDS_SRIO_PCIE_BOOT_config"
 UBOOT_CONFIG[secure-boot] = "T2080QDS_SECURE_BOOT_config"
 
-
-HV_CFG_M = "t2080qds"
-
-KERNEL_DEVICETREE ?= "t2080qds.dtb t2080qds-usdpaa.dtb \
-    t2080qds-usdpaa-shared-interfaces.dtb \
+KERNEL_DEVICETREE ?= "fsl/t2080qds.dtb fsl/t2080qds-usdpaa.dtb \
+    fsl/t2080qds-usdpaa-shared-interfaces.dtb \
 "
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
+HV_CFG_M = "t2080qds"
 JFFS2_ERASEBLOCK = "0x10000"
-
 EXTRA_IMAGEDEPENDS += "fm-ucode rcw lib64-hypervisor hv-cfg"
-
 USE_VT ?= "0"
diff --git a/conf/machine/t2080rdb-64b.conf b/conf/machine/t2080rdb-64b.conf
index 1d3200e..b74e536 100644
--- a/conf/machine/t2080rdb-64b.conf
+++ b/conf/machine/t2080rdb-64b.conf
@@ -9,7 +9,7 @@ require conf/machine/include/e6500-64b.inc
 
 SOC_FAMILY = "t2:t2080"
 
-UBOOT_CONFIG ??= "nor nor sdcard spi nand srio-pcie-boot secure-boot"
+UBOOT_CONFIG ??= "nor sdcard spi nand srio-pcie-boot secure-boot nor"
 UBOOT_CONFIG[nor] = "T2080RDB_config"
 UBOOT_CONFIG[sdcard] = "T2080RDB_SDCARD_config"
 UBOOT_CONFIG[spi] = "T2080RDB_SPIFLASH_config"
@@ -17,16 +17,12 @@ UBOOT_CONFIG[nand] = "T2080RDB_NAND_config"
 UBOOT_CONFIG[srio-pcie-boot] = "T2080RDB_SRIO_PCIE_BOOT_config"
 UBOOT_CONFIG[secure-boot] = "T2080RDB_SECURE_BOOT_config"
 
-
-HV_CFG_M = "t2080rdb"
-
-KERNEL_DEVICETREE ?= "t2080rdb.dtb t2080rdb-usdpaa.dtb \
-    t2080rdb-usdpaa-shared-interfaces.dtb \
+KERNEL_DEVICETREE ?= "fsl/t2080rdb.dtb fsl/t2080rdb-usdpaa.dtb \
+    fsl/t2080rdb-usdpaa-shared-interfaces.dtb \
 "
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
+HV_CFG_M = "t2080rdb"
 JFFS2_ERASEBLOCK = "0x10000"
-
 EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
-
 USE_VT ?= "0"
diff --git a/conf/machine/t2080rdb.conf b/conf/machine/t2080rdb.conf
index ba4b29c..55f1c13 100644
--- a/conf/machine/t2080rdb.conf
+++ b/conf/machine/t2080rdb.conf
@@ -9,7 +9,7 @@ require conf/machine/include/e6500.inc
 
 SOC_FAMILY = "t2:t2080"
 
-UBOOT_CONFIG ??= "nor sdcard spi nand srio-pcie-boot secure-boot"
+UBOOT_CONFIG ??= "sdcard spi nand srio-pcie-boot secure-boot nor"
 UBOOT_CONFIG[nor] = "T2080RDB_config"
 UBOOT_CONFIG[sdcard] = "T2080RDB_SDCARD_config"
 UBOOT_CONFIG[spi] = "T2080RDB_SPIFLASH_config"
@@ -17,16 +17,12 @@ UBOOT_CONFIG[nand] = "T2080RDB_NAND_config"
 UBOOT_CONFIG[srio-pcie-boot] = "T2080RDB_SRIO_PCIE_BOOT_config"
 UBOOT_CONFIG[secure-boot] = "T2080RDB_SECURE_BOOT_config"
 
-
-HV_CFG_M = "t2080rdb"
-
-KERNEL_DEVICETREE ?= "t2080rdb.dtb t2080rdb-usdpaa.dtb \
-    t2080rdb-usdpaa-shared-interfaces.dtb \
+KERNEL_DEVICETREE ?= "fsl/t2080rdb.dtb fsl/t2080rdb-usdpaa.dtb \
+    fsl/t2080rdb-usdpaa-shared-interfaces.dtb \
 "
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
+HV_CFG_M = "t2080rdb"
 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