[meta-freescale] [meta-fsl-ppc][PATCH 7/9] qe-ucode: install if QE_UCODE defined
ting.liu at freescale.com
ting.liu at freescale.com
Wed Jan 7 01:55:05 PST 2015
From: Ting Liu <ting.liu at freescale.com>
* only install if QE_UCODE defined
* move QE_UCODE definition to machine file
* remove COMPATIBLE_MACHINE setting as PACKAGE will be empty
if QE_UCODE not defined
Signed-off-by: Ting Liu <ting.liu at freescale.com>
---
conf/machine/p1021rdb.conf | 1 +
conf/machine/p1025twr.conf | 1 +
conf/machine/t1024qds-64b.conf | 1 +
conf/machine/t1024qds.conf | 1 +
conf/machine/t1024rdb-64b.conf | 1 +
conf/machine/t1024rdb.conf | 1 +
conf/machine/t1040rdb-64b.conf | 1 +
conf/machine/t1040rdb.conf | 1 +
conf/machine/t1042rdb-64b.conf | 1 +
conf/machine/t1042rdb.conf | 1 +
recipes-bsp/qe-ucode/qe-ucode_git.bb | 23 ++++++++---------------
11 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/conf/machine/p1021rdb.conf b/conf/machine/p1021rdb.conf
index 4c793e8..03a1821 100644
--- a/conf/machine/p1021rdb.conf
+++ b/conf/machine/p1021rdb.conf
@@ -13,4 +13,5 @@ KERNEL_DEVICETREE ?= "p1021rdb-pc_32b.dtb"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
JFFS2_ERASEBLOCK = "0x20000"
+QE_UCODE ?= "fsl_qe_ucode_1021_10_A.bin"
diff --git a/conf/machine/p1025twr.conf b/conf/machine/p1025twr.conf
index 67fa569..0c6bb57 100644
--- a/conf/machine/p1025twr.conf
+++ b/conf/machine/p1025twr.conf
@@ -13,4 +13,5 @@ KERNEL_DEVICETREE ?= "p1025twr_32b.dtb"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
JFFS2_ERASEBLOCK = "0x20000"
+QE_UCODE ?= "fsl_qe_ucode_1021_10_A.bin"
diff --git a/conf/machine/t1024qds-64b.conf b/conf/machine/t1024qds-64b.conf
index 81d5763..9dc047c 100644
--- a/conf/machine/t1024qds-64b.conf
+++ b/conf/machine/t1024qds-64b.conf
@@ -12,4 +12,5 @@ KERNEL_DEVICETREE ?= "t1024qds.dtb t1024qds-usdpaa.dtb t1024qds-usdpaa-capwap.dt
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
+QE_UCODE ?= "iram_Type_A_T1024_r1.0.bin"
diff --git a/conf/machine/t1024qds.conf b/conf/machine/t1024qds.conf
index 3e5cac1..dc043a3 100644
--- a/conf/machine/t1024qds.conf
+++ b/conf/machine/t1024qds.conf
@@ -12,4 +12,5 @@ KERNEL_DEVICETREE ?= "t1024qds.dtb t1024qds-usdpaa.dtb t1024qds-usdpaa-capwap.dt
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
+QE_UCODE ?= "iram_Type_A_T1024_r1.0.bin"
diff --git a/conf/machine/t1024rdb-64b.conf b/conf/machine/t1024rdb-64b.conf
index c40bba8..e9e66b2 100644
--- a/conf/machine/t1024rdb-64b.conf
+++ b/conf/machine/t1024rdb-64b.conf
@@ -12,4 +12,5 @@ KERNEL_DEVICETREE ?= "t1024rdb.dtb t1024rdb-usdpaa.dtb t1024rdb-usdpaa-capwap.dt
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
+QE_UCODE ?= "iram_Type_A_T1024_r1.0.bin"
diff --git a/conf/machine/t1024rdb.conf b/conf/machine/t1024rdb.conf
index 82a0400..80d87bd 100644
--- a/conf/machine/t1024rdb.conf
+++ b/conf/machine/t1024rdb.conf
@@ -12,4 +12,5 @@ KERNEL_DEVICETREE ?= "t1024rdb.dtb t1024rdb-usdpaa.dtb t1024rdb-usdpaa-capwap.dt
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
+QE_UCODE ?= "iram_Type_A_T1024_r1.0.bin"
diff --git a/conf/machine/t1040rdb-64b.conf b/conf/machine/t1040rdb-64b.conf
index c489f8f..6196097 100644
--- a/conf/machine/t1040rdb-64b.conf
+++ b/conf/machine/t1040rdb-64b.conf
@@ -12,4 +12,5 @@ KERNEL_DEVICETREE ?= "t1040rdb.dtb t1040rdb-usdpaa.dtb"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
+QE_UCODE ?= "iram_Type_A_T1040_r1.0.bin"
diff --git a/conf/machine/t1040rdb.conf b/conf/machine/t1040rdb.conf
index 5c4f682..e70c44b 100644
--- a/conf/machine/t1040rdb.conf
+++ b/conf/machine/t1040rdb.conf
@@ -12,4 +12,5 @@ KERNEL_DEVICETREE ?= "t1040rdb.dtb t1040rdb-usdpaa.dtb"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
+QE_UCODE ?= "iram_Type_A_T1040_r1.0.bin"
diff --git a/conf/machine/t1042rdb-64b.conf b/conf/machine/t1042rdb-64b.conf
index 23c4a0f..d60cdd0 100644
--- a/conf/machine/t1042rdb-64b.conf
+++ b/conf/machine/t1042rdb-64b.conf
@@ -12,4 +12,5 @@ KERNEL_DEVICETREE ?= "t1042rdb_pi.dtb"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
+QE_UCODE ?= "iram_Type_A_T1040_r1.0.bin"
diff --git a/conf/machine/t1042rdb.conf b/conf/machine/t1042rdb.conf
index e10065b..b530b0e 100644
--- a/conf/machine/t1042rdb.conf
+++ b/conf/machine/t1042rdb.conf
@@ -12,4 +12,5 @@ KERNEL_DEVICETREE ?= "t1042rdb_pi.dtb"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3_smp_defconfig"
JFFS2_ERASEBLOCK = "0x10000"
+QE_UCODE ?= "iram_Type_A_T1040_r1.0.bin"
diff --git a/recipes-bsp/qe-ucode/qe-ucode_git.bb b/recipes-bsp/qe-ucode/qe-ucode_git.bb
index 06a7298..02aca16 100644
--- a/recipes-bsp/qe-ucode/qe-ucode_git.bb
+++ b/recipes-bsp/qe-ucode/qe-ucode_git.bb
@@ -11,28 +11,21 @@ SRCREV= "49efc94b553de5c2a9bd28093592eff0068e161c"
S = "${WORKDIR}/git"
do_install () {
- case ${MACHINE} in
- p1025rdb|p1021rdb|p1025twr) QE_UCODE="fsl_qe_ucode_1021_10_A.bin";;
- t1040rdb|t1040rdb-64b) QE_UCODE="iram_Type_A_T1040_r1.0.bin";;
- *) QE_UCODE="";;
- esac
- install -d ${D}/
- install -m 644 ${QE_UCODE} ${D}/
+ if [ -n "${QE_UCODE}" ];then
+ install -d ${D}/boot
+ install -m 644 ${QE_UCODE} ${D}/boot/
+ fi
}
do_deploy () {
- case ${MACHINE} in
- p1025rdb|p1021rdb|p1025twr) QE_UCODE="fsl_qe_ucode_1021_10_A.bin";;
- t1040rdb|t1040rdb-64b) QE_UCODE="iram_Type_A_T1040_r1.0.bin";;
- *) QE_UCODE="";;
- esac
- install -d ${DEPLOYDIR}/
- install -m 644 ${QE_UCODE} ${DEPLOYDIR}/
+ if [ -n "${QE_UCODE}" ];then
+ install -d ${DEPLOYDIR}
+ install -m 644 ${QE_UCODE} ${DEPLOYDIR}/
+ fi
}
addtask deploy before do_build after do_install
PACKAGES += "${PN}-image"
FILES_${PN}-image += "/*"
ALLOW_EMPTY_${PN} = "1"
-COMPATIBLE_MACHINE = "(p1025rdb|p1021rdb|p1025twr|t1040rdb|t1040rdb-64b)"
--
1.9.1
More information about the meta-freescale
mailing list