[meta-freescale] [meta-freescale-layer][PATCH 3/3] adjust UBOOT_CONFIG order to let nor as the last one
ting.liu at nxp.com
ting.liu at nxp.com
Fri Aug 12 18:33:50 PDT 2016
From: Ting Liu <ting.liu at nxp.com>
The symlink u-boot.bin and u-boot-${MACHINE}.bin will be linked to
binary of the last UBOOT_CONFIG. Put nor u-boot as the last one.
Signed-off-by: Ting Liu <ting.liu at nxp.com>
---
conf/machine/b4860qds-64b.conf | 5 ++---
conf/machine/b4860qds.conf | 5 ++---
conf/machine/c293pcie.conf | 2 +-
conf/machine/t4160qds-64b.conf | 5 +----
conf/machine/t4160qds.conf | 3 ---
conf/machine/t4240qds-64b.conf | 4 +---
conf/machine/t4240qds.conf | 4 +---
conf/machine/t4240rdb-64b.conf | 2 --
conf/machine/t4240rdb.conf | 2 --
9 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/conf/machine/b4860qds-64b.conf b/conf/machine/b4860qds-64b.conf
index 6ace643..b3ef4e6 100644
--- a/conf/machine/b4860qds-64b.conf
+++ b/conf/machine/b4860qds-64b.conf
@@ -9,7 +9,8 @@
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"
@@ -19,7 +20,5 @@ KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb \
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
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 b8b4623..eb8ea1a 100644
--- a/conf/machine/b4860qds.conf
+++ b/conf/machine/b4860qds.conf
@@ -9,7 +9,8 @@
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"
@@ -19,7 +20,5 @@ KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb \
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-
EXTRA_IMAGEDEPENDS += "fm-ucode rcw lib64-hypervisor hv-cfg"
-
USE_VT ?= "0"
diff --git a/conf/machine/c293pcie.conf b/conf/machine/c293pcie.conf
index a6ddb4c..82c7153 100644
--- a/conf/machine/c293pcie.conf
+++ b/conf/machine/c293pcie.conf
@@ -10,7 +10,7 @@ require conf/machine/include/e500v2.inc
SOC_FAMILY = "c293pcie"
BOOTFORMAT_CONFIG = "config_ddr3_512m_c29xpcie_800M.dat"
-UBOOT_CONFIG ??= "nor spi secboot spi-secboot"
+UBOOT_CONFIG ??= "spi secboot spi-secboot nor"
UBOOT_CONFIG[nor] = "C29XPCIE_config"
UBOOT_CONFIG[spi] = "C29XPCIE_SPIFLASH_config"
UBOOT_CONFIG[secboot] = "C29XPCIE_NOR_SECBOOT_config"
diff --git a/conf/machine/t4160qds-64b.conf b/conf/machine/t4160qds-64b.conf
index d18d900..75e4d0f 100644
--- a/conf/machine/t4160qds-64b.conf
+++ b/conf/machine/t4160qds-64b.conf
@@ -9,16 +9,13 @@ require conf/machine/include/e6500-64b.inc
SOC_FAMILY = "t4:t4160"
-UBOOT_CONFIG ??= "nor secure-boot"
+UBOOT_CONFIG ??= "secure-boot nor"
UBOOT_CONFIG[nor] = "T4160QDS_config"
UBOOT_CONFIG[secure-boot] = "T4160QDS_SECURE_BOOT_config"
-
KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-
EXTRA_IMAGEDEPENDS += "fm-ucode"
-
USE_VT ?= "0"
diff --git a/conf/machine/t4160qds.conf b/conf/machine/t4160qds.conf
index 48dacb3..9c79ad5 100644
--- a/conf/machine/t4160qds.conf
+++ b/conf/machine/t4160qds.conf
@@ -13,12 +13,9 @@ UBOOT_CONFIG ??= "secure-boot nor"
UBOOT_CONFIG[nor] = "T4160QDS_config"
UBOOT_CONFIG[secure-boot] = "T4160QDS_SECURE_BOOT_config"
-
KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
-
EXTRA_IMAGEDEPENDS += "fm-ucode"
-
USE_VT ?= "0"
diff --git a/conf/machine/t4240qds-64b.conf b/conf/machine/t4240qds-64b.conf
index 1b960c2..c5fbe49 100644
--- a/conf/machine/t4240qds-64b.conf
+++ b/conf/machine/t4240qds-64b.conf
@@ -9,7 +9,7 @@ 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"
@@ -19,7 +19,5 @@ KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb \
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
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 2840ac6..d8ca3cf 100644
--- a/conf/machine/t4240qds.conf
+++ b/conf/machine/t4240qds.conf
@@ -9,7 +9,7 @@ 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"
@@ -19,7 +19,5 @@ KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb \
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
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 6399c94..c9a2da6 100644
--- a/conf/machine/t4240rdb-64b.conf
+++ b/conf/machine/t4240rdb-64b.conf
@@ -18,7 +18,5 @@ KERNEL_DEVICETREE ?= "t4240rdb.dtb t4240rdb-usdpaa.dtb \
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
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 1e51a40..fa4c0b0 100644
--- a/conf/machine/t4240rdb.conf
+++ b/conf/machine/t4240rdb.conf
@@ -18,7 +18,5 @@ KERNEL_DEVICETREE ?= "t4240rdb.dtb t4240rdb-usdpaa.dtb \
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
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