[meta-freescale] [PATCH 2/2] hv-cfg: move SOC specific variables to qoriq-base.inc

[Zhenhua Luo]

* Add HV_CFG_M variables in qoriq-base.inc
* Use HV_CFG_M in hv-cfg bb file

Signed-off-by: Zhenhua Luo <zhenhua.luo at freescale.com>
---
 conf/machine/include/qoriq-base.inc         |  4 ++++
 recipes-virtualization/hv-cfg/hv-cfg_git.bb | 10 ++--------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc
index f85f18e..aef892f 100644
--- a/conf/machine/include/qoriq-base.inc
+++ b/conf/machine/include/qoriq-base.inc
@@ -24,4 +24,8 @@ IPC_UST_SOC_bsc9131 = "B913x"
 IPC_UST_SOC_bsc9132 = "B913x"
 IPC_UST_SOC_b4 = "B4860"
 
+HV_CFG_M = "${MACHINE}"
+HV_CFG_M_t1040d4rdb = "t1040rdb"
+HV_CFG_M_t1042d4rdb = "t1040rdb"
+
 MACHINEOVERRIDES .= ":qoriq"
diff --git a/recipes-virtualization/hv-cfg/hv-cfg_git.bb b/recipes-virtualization/hv-cfg/hv-cfg_git.bb
index e4f18e0..8656c02 100644
--- a/recipes-virtualization/hv-cfg/hv-cfg_git.bb
+++ b/recipes-virtualization/hv-cfg/hv-cfg_git.bb
@@ -26,19 +26,13 @@ S = "${WORKDIR}/git"
 do_install () {
 	make install
 
-	M=`echo ${MACHINE} | sed s/-64b//g`
-	if [ "t1042d4rdb" = "${M}" ] || [ "t1040d4rdb" = "${M}" ];then
-		M=t1040rdb
-	fi
+	M=`echo ${HV_CFG_M} | sed s/-64b//g`
 	install -d ${D}/boot/hv-cfg
 	cp -r ${S}/${M}/${M}/* ${D}/boot/hv-cfg
 }
 
 do_deploy () {
-	M=`echo ${MACHINE} | sed s/-64b//g`
-	if [ "t1042d4rdb" = "${M}" ] || [ "t1040d4rdb" = "${M}" ];then
-		M=t1040rdb
-	fi
+	M=`echo ${HV_CFG_M} | sed s/-64b//g`
 	install -d ${DEPLOYDIR}/hv-cfg
 	cp -r ${S}/${M}/${M}/* ${DEPLOYDIR}/hv-cfg
 }
-- 
2.4.3