[meta-freescale] [meta-freescale-layer][PATCH 64/67] hv-cfg: not use MACHINE specific variable
ting.liu at nxp.com
ting.liu at nxp.com
Fri Jul 1 01:38:42 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 | 1 -
conf/machine/b4860qds.conf | 1 -
conf/machine/p2041rdb.conf | 1 -
conf/machine/p3041ds.conf | 1 -
conf/machine/p4080ds.conf | 1 -
conf/machine/p5020ds-64b.conf | 1 -
conf/machine/p5020ds.conf | 1 -
conf/machine/p5040ds-64b.conf | 1 -
conf/machine/p5040ds.conf | 1 -
conf/machine/t1024rdb-64b.conf | 1 -
conf/machine/t1024rdb.conf | 1 -
conf/machine/t1040d4rdb-64b.conf | 1 -
conf/machine/t1040d4rdb.conf | 1 -
conf/machine/t1042d4rdb-64b.conf | 1 -
conf/machine/t1042d4rdb.conf | 1 -
conf/machine/t2080qds-64b.conf | 1 -
conf/machine/t2080qds.conf | 1 -
conf/machine/t2080rdb-64b.conf | 1 -
conf/machine/t2080rdb.conf | 1 -
conf/machine/t4240qds-64b.conf | 1 -
conf/machine/t4240qds.conf | 1 -
conf/machine/t4240rdb-64b.conf | 1 -
conf/machine/t4240rdb.conf | 1 -
recipes-virtualization/hv-cfg/hv-cfg_git.bb | 7 ++-----
24 files changed, 2 insertions(+), 28 deletions(-)
diff --git a/conf/machine/b4860qds-64b.conf b/conf/machine/b4860qds-64b.conf
index 27518e1..5e8d9f4 100644
--- a/conf/machine/b4860qds-64b.conf
+++ b/conf/machine/b4860qds-64b.conf
@@ -19,7 +19,6 @@ KERNEL_DEVICETREE ?= "fsl/b4860qds.dtb fsl/b4860qds-usdpaa.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 32acf83..2b8cdab 100644
--- a/conf/machine/b4860qds.conf
+++ b/conf/machine/b4860qds.conf
@@ -19,7 +19,6 @@ KERNEL_DEVICETREE ?= "fsl/b4860qds.dtb fsl/b4860qds-usdpaa.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"
diff --git a/conf/machine/p2041rdb.conf b/conf/machine/p2041rdb.conf
index 0b05852..82396f1 100644
--- a/conf/machine/p2041rdb.conf
+++ b/conf/machine/p2041rdb.conf
@@ -19,7 +19,6 @@ KERNEL_DEVICETREE ?= "fsl/p2041rdb.dtb fsl/p2041rdb-usdpaa.dtb \
"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
-HV_CFG_M = "p2041rdb"
JFFS2_ERASEBLOCK = "0x10000"
EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
USE_VT ?= "0"
diff --git a/conf/machine/p3041ds.conf b/conf/machine/p3041ds.conf
index 73a4749..e168dd1 100644
--- a/conf/machine/p3041ds.conf
+++ b/conf/machine/p3041ds.conf
@@ -21,7 +21,6 @@ KERNEL_DEVICETREE ?= "fsl/p3041ds.dtb fsl/p3041ds-usdpaa.dtb \
"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
-HV_CFG_M = "p3041ds"
JFFS2_ERASEBLOCK = "0x10000"
EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
USE_VT ?= "0"
diff --git a/conf/machine/p4080ds.conf b/conf/machine/p4080ds.conf
index 9412b32..bb28dbd 100644
--- a/conf/machine/p4080ds.conf
+++ b/conf/machine/p4080ds.conf
@@ -20,7 +20,6 @@ KERNEL_DEVICETREE ?= "fsl/p4080ds.dtb fsl/p4080ds-usdpaa.dtb \
"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
-HV_CFG_M = "p4080ds"
JFFS2_ERASEBLOCK = "0x10000"
EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
USE_VT ?= "0"
diff --git a/conf/machine/p5020ds-64b.conf b/conf/machine/p5020ds-64b.conf
index de56cef..62d407d 100644
--- a/conf/machine/p5020ds-64b.conf
+++ b/conf/machine/p5020ds-64b.conf
@@ -21,7 +21,6 @@ KERNEL_DEVICETREE ?= "fsl/p5020ds.dtb fsl/p5020ds-usdpaa.dtb \
"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
-HV_CFG_M = "p5020ds"
JFFS2_ERASEBLOCK = "0x10000"
EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
USE_VT ?= "0"
diff --git a/conf/machine/p5020ds.conf b/conf/machine/p5020ds.conf
index 1ec5a47..31f8084 100644
--- a/conf/machine/p5020ds.conf
+++ b/conf/machine/p5020ds.conf
@@ -21,7 +21,6 @@ KERNEL_DEVICETREE ?= "fsl/p5020ds.dtb fsl/p5020ds-usdpaa.dtb \
"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
-HV_CFG_M = "p5020ds"
JFFS2_ERASEBLOCK = "0x10000"
EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
USE_VT ?= "0"
diff --git a/conf/machine/p5040ds-64b.conf b/conf/machine/p5040ds-64b.conf
index 7250ebb..c785245 100644
--- a/conf/machine/p5040ds-64b.conf
+++ b/conf/machine/p5040ds-64b.conf
@@ -21,7 +21,6 @@ KERNEL_DEVICETREE ?= "fsl/p5040ds.dtb fsl/p5040ds-usdpaa.dtb \
"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
-HV_CFG_M = "p5040ds"
JFFS2_ERASEBLOCK = "0x10000"
EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
USE_VT ?= "0"
diff --git a/conf/machine/p5040ds.conf b/conf/machine/p5040ds.conf
index 2d3e212..cb01597 100644
--- a/conf/machine/p5040ds.conf
+++ b/conf/machine/p5040ds.conf
@@ -21,7 +21,6 @@ KERNEL_DEVICETREE ?= "fsl/p5040ds.dtb fsl/p5040ds-usdpaa.dtb \
"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
-HV_CFG_M = "p5040ds"
JFFS2_ERASEBLOCK = "0x10000"
EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
USE_VT ?= "0"
diff --git a/conf/machine/t1024rdb-64b.conf b/conf/machine/t1024rdb-64b.conf
index 64ae3fc..36fd885 100644
--- a/conf/machine/t1024rdb-64b.conf
+++ b/conf/machine/t1024rdb-64b.conf
@@ -21,7 +21,6 @@ KERNEL_DEVICETREE ?= "fsl/t1024rdb.dtb fsl/t1024rdb-usdpaa.dtb \
"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3l_smp_defconfig"
-HV_CFG_M = "t1024rdb"
JFFS2_ERASEBLOCK = "0x10000"
QE_UCODE ?= "iram_Type_A_T1024_r1.0.bin"
EXTRA_IMAGEDEPENDS += "fm-ucode rcw qe-ucode"
diff --git a/conf/machine/t1024rdb.conf b/conf/machine/t1024rdb.conf
index 0fb8707..406ff71 100644
--- a/conf/machine/t1024rdb.conf
+++ b/conf/machine/t1024rdb.conf
@@ -21,7 +21,6 @@ KERNEL_DEVICETREE ?= "fsl/t1024rdb.dtb fsl/t1024rdb-usdpaa.dtb \
"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3l_smp_defconfig"
-HV_CFG_M = "t1024rdb"
JFFS2_ERASEBLOCK = "0x10000"
QE_UCODE ?= "iram_Type_A_T1024_r1.0.bin"
EXTRA_IMAGEDEPENDS += "fm-ucode rcw qe-ucode"
diff --git a/conf/machine/t1040d4rdb-64b.conf b/conf/machine/t1040d4rdb-64b.conf
index dece0f5..9567d38 100644
--- a/conf/machine/t1040d4rdb-64b.conf
+++ b/conf/machine/t1040d4rdb-64b.conf
@@ -22,7 +22,6 @@ KERNEL_DEVICETREE ?= "fsl/t1040d4rdb.dtb fsl/t1040d4rdb-usdpaa.dtb \
"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3l_smp_defconfig"
-HV_CFG_M = "t1040rdb"
JFFS2_ERASEBLOCK = "0x10000"
QE_UCODE = "iram_Type_A_T1040_r1.0.bin"
EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg qe-ucode"
diff --git a/conf/machine/t1040d4rdb.conf b/conf/machine/t1040d4rdb.conf
index 3e8c670..f8dcc62 100644
--- a/conf/machine/t1040d4rdb.conf
+++ b/conf/machine/t1040d4rdb.conf
@@ -22,7 +22,6 @@ KERNEL_DEVICETREE ?= "fsl/t1040d4rdb.dtb fsl/t1040d4rdb-usdpaa.dtb \
"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3l_smp_defconfig"
-HV_CFG_M = "t1040rdb"
JFFS2_ERASEBLOCK = "0x10000"
QE_UCODE = "iram_Type_A_T1040_r1.0.bin"
EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg qe-ucode"
diff --git a/conf/machine/t1042d4rdb-64b.conf b/conf/machine/t1042d4rdb-64b.conf
index 9e39566..01ab386 100644
--- a/conf/machine/t1042d4rdb-64b.conf
+++ b/conf/machine/t1042d4rdb-64b.conf
@@ -22,7 +22,6 @@ KERNEL_DEVICETREE ?= "fsl/t1042d4rdb.dtb fsl/t1042d4rdb-usdpaa.dtb \
"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3l_smp_defconfig"
-HV_CFG_M = "t1040rdb"
JFFS2_ERASEBLOCK = "0x10000"
QE_UCODE = "iram_Type_A_T1040_r1.0.bin"
EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg qe-ucode"
diff --git a/conf/machine/t1042d4rdb.conf b/conf/machine/t1042d4rdb.conf
index 0288ae1..3f99ae8 100644
--- a/conf/machine/t1042d4rdb.conf
+++ b/conf/machine/t1042d4rdb.conf
@@ -22,7 +22,6 @@ KERNEL_DEVICETREE ?= "fsl/t1042d4rdb.dtb fsl/t1042d4rdb-usdpaa.dtb \
"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3l_smp_defconfig"
-HV_CFG_M = "t1040rdb"
JFFS2_ERASEBLOCK = "0x10000"
QE_UCODE = "iram_Type_A_T1040_r1.0.bin"
EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg qe-ucode"
diff --git a/conf/machine/t2080qds-64b.conf b/conf/machine/t2080qds-64b.conf
index 3ce7e16..470cbe8 100644
--- a/conf/machine/t2080qds-64b.conf
+++ b/conf/machine/t2080qds-64b.conf
@@ -22,7 +22,6 @@ KERNEL_DEVICETREE ?= "fsl/t2080qds.dtb fsl/t2080qds-usdpaa.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 a148679..3a4081c 100644
--- a/conf/machine/t2080qds.conf
+++ b/conf/machine/t2080qds.conf
@@ -22,7 +22,6 @@ KERNEL_DEVICETREE ?= "fsl/t2080qds.dtb fsl/t2080qds-usdpaa.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 b74e536..c3b2f7a 100644
--- a/conf/machine/t2080rdb-64b.conf
+++ b/conf/machine/t2080rdb-64b.conf
@@ -22,7 +22,6 @@ KERNEL_DEVICETREE ?= "fsl/t2080rdb.dtb fsl/t2080rdb-usdpaa.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 55f1c13..c8bdc17 100644
--- a/conf/machine/t2080rdb.conf
+++ b/conf/machine/t2080rdb.conf
@@ -22,7 +22,6 @@ KERNEL_DEVICETREE ?= "fsl/t2080rdb.dtb fsl/t2080rdb-usdpaa.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"
diff --git a/conf/machine/t4240qds-64b.conf b/conf/machine/t4240qds-64b.conf
index 6f31593..e236a1c 100644
--- a/conf/machine/t4240qds-64b.conf
+++ b/conf/machine/t4240qds-64b.conf
@@ -18,7 +18,6 @@ KERNEL_DEVICETREE ?= "fsl/t4240qds.dtb fsl/t4240qds-usdpaa.dtb \
"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
-HV_CFG_M = "t4240qds"
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 1e72c51..0a4ac44 100644
--- a/conf/machine/t4240qds.conf
+++ b/conf/machine/t4240qds.conf
@@ -18,7 +18,6 @@ KERNEL_DEVICETREE ?= "fsl/t4240qds.dtb fsl/t4240qds-usdpaa.dtb \
"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
-HV_CFG_M = "t4240qds"
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 432a45a..92f7e9a 100644
--- a/conf/machine/t4240rdb-64b.conf
+++ b/conf/machine/t4240rdb-64b.conf
@@ -17,7 +17,6 @@ KERNEL_DEVICETREE ?= "fsl/t4240rdb.dtb fsl/t4240rdb-usdpaa.dtb \
"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
-HV_CFG_M = "t4240rdb"
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 9bc472b..d76fab0 100644
--- a/conf/machine/t4240rdb.conf
+++ b/conf/machine/t4240rdb.conf
@@ -17,7 +17,6 @@ KERNEL_DEVICETREE ?= "fsl/t4240rdb.dtb fsl/t4240rdb-usdpaa.dtb \
"
KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
-HV_CFG_M = "t4240rdb"
JFFS2_ERASEBLOCK = "0x10000"
EXTRA_IMAGEDEPENDS += "fm-ucode rcw lib64-hypervisor hv-cfg"
USE_VT ?= "0"
diff --git a/recipes-virtualization/hv-cfg/hv-cfg_git.bb b/recipes-virtualization/hv-cfg/hv-cfg_git.bb
index 57cba44..4f147d2 100644
--- a/recipes-virtualization/hv-cfg/hv-cfg_git.bb
+++ b/recipes-virtualization/hv-cfg/hv-cfg_git.bb
@@ -23,11 +23,8 @@ SRCREV = "348748b2ce26258509997b19fead0dd7bba4dea4"
S = "${WORKDIR}/git"
-python () {
- if not d.getVar("HV_CFG_M", True):
- raise bb.parse.SkipPackage("HV_CFG_M is not defined, please \
-check ${MACHINE}.conf file.")
-}
+HV_CFG_M ?= "${@d.getVar('MACHINE', True).replace('-64b','')}"
+HV_CFG_M_t1042 = "t1040rdb"
do_install () {
make install
--
1.9.2
More information about the meta-freescale
mailing list