hv-cfg: not set HV_CFG_M in machine conf

It is simple to do it in hv-cfg recipe.

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/conf/machine/b4860qds-64b.conf b/conf/machine/b4860qds-64b.conf
index ff99d2a3717db2a4668d2cd4d6b77f0310bdd1ab..6ace6433596b0017fd4c8f73b81c231ceb4b3ac3 100644 (file)
--- a/conf/machine/b4860qds-64b.conf
+++ b/conf/machine/b4860qds-64b.conf
@@ -13,9 +13,6 @@ UBOOT_CONFIG ??= "nor secure-boot"
 UBOOT_CONFIG[nor] = "B4860QDS_config"
 UBOOT_CONFIG[secure-boot] = "B4860QDS_SECURE_BOOT_config"
 
-
-HV_CFG_M = "b4860qds"
-
 KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb \
     b4860qds-usdpaa-shared-interfaces.dtb \
 "

diff --git a/conf/machine/b4860qds.conf b/conf/machine/b4860qds.conf
index 95d3ce83942a5a6a5c86a9c62f72b5325f052fb9..b8b462364ad727ecfd9ac5381f2dd57a7cb3ede1 100644 (file)
--- a/conf/machine/b4860qds.conf
+++ b/conf/machine/b4860qds.conf
@@ -13,9 +13,6 @@ UBOOT_CONFIG ??= "nor secure-boot"
 UBOOT_CONFIG[nor] = "B4860QDS_config"
 UBOOT_CONFIG[secure-boot] = "B4860QDS_SECURE_BOOT_config"
 
-
-HV_CFG_M = "b4860qds"
-
 KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb \
     b4860qds-usdpaa-shared-interfaces.dtb \
 "

diff --git a/conf/machine/p2041rdb.conf b/conf/machine/p2041rdb.conf
index 9b91a2cde12c63f130dbeac5a2e2c3afeeb24652..a3ecac5b779075e56eec5ec58b8c1ae86fc1e7b1 100644 (file)
--- a/conf/machine/p2041rdb.conf
+++ b/conf/machine/p2041rdb.conf
@@ -16,9 +16,6 @@ UBOOT_CONFIG[secure-boot] = "P2041RDB_SECURE_BOOT_config"
 UBOOT_CONFIG[sdcard] = "P2041RDB_SDCARD_config"
 UBOOT_CONFIG[spi] = "P2041RDB_SPIFLASH_config"
 
-
-HV_CFG_M = "p2041rdb"
-
 KERNEL_DEVICETREE ?= "p2041rdb.dtb p2041rdb-usdpaa.dtb \
     p2041rdb-usdpaa-shared-interfaces.dtb \
 "

diff --git a/conf/machine/p3041ds.conf b/conf/machine/p3041ds.conf
index 13d8530b4aac7f14251a4222572a0fc49422588e..8b2bb1dad7f8f4319e380138636c5353e64d0021 100644 (file)
--- a/conf/machine/p3041ds.conf
+++ b/conf/machine/p3041ds.conf
@@ -16,9 +16,6 @@ UBOOT_CONFIG[secure-boot] = "P3041DS_SECURE_BOOT_config"
 UBOOT_CONFIG[sdcard] = "P3041DS_SDCARD_config"
 UBOOT_CONFIG[spi] = "P3041DS_SPIFLASH_config"
 
-
-HV_CFG_M = "p3041ds"
-
 KERNEL_DEVICETREE ?= "p3041ds.dtb p3041ds-usdpaa.dtb \
     p3041ds-usdpaa-shared-interfaces.dtb \
 "

diff --git a/conf/machine/p4080ds.conf b/conf/machine/p4080ds.conf
index fe160272b60eb89f697ee573a50ce512c077f70e..1bbe90533a36969ad741eddbb7db76d24a2daaf4 100644 (file)
--- a/conf/machine/p4080ds.conf
+++ b/conf/machine/p4080ds.conf
@@ -15,9 +15,6 @@ UBOOT_CONFIG[secure-boot] = "P4080DS_SECURE_BOOT_config"
 UBOOT_CONFIG[sdcard] = "P4080DS_SDCARD_config"
 UBOOT_CONFIG[spi] = "P4080DS_SPIFLASH_config"
 
-
-HV_CFG_M = "p4080ds"
-
 KERNEL_DEVICETREE ?= "p4080ds.dtb p4080ds-usdpaa.dtb \
     p4080ds-usdpaa-shared-interfaces.dtb \
 "

diff --git a/conf/machine/p5020ds-64b.conf b/conf/machine/p5020ds-64b.conf
index 223031de22fb5b1f173f862e74e3675f36f9c019..54cca65a27630cf29372f9038e8a38b2dfdf1b05 100644 (file)
--- a/conf/machine/p5020ds-64b.conf
+++ b/conf/machine/p5020ds-64b.conf
@@ -16,9 +16,6 @@ UBOOT_CONFIG[secure-boot] = "P5020DS_SECURE_BOOT_config"
 UBOOT_CONFIG[sdcard] = "P5020DS_SDCARD_config"
 UBOOT_CONFIG[spi] = "P5020DS_SPIFLASH_config"
 
-
-HV_CFG_M = "p5020ds"
-
 KERNEL_DEVICETREE ?= "p5020ds.dtb p5020ds-usdpaa.dtb \
     p5020ds-usdpaa-shared-interfaces.dtb \
 "

diff --git a/conf/machine/p5020ds.conf b/conf/machine/p5020ds.conf
index 9113e2c1582a4045b2b316b8b61052c2b0e85445..e25e3dd1157f0cfdf760b4f6c26037ba851e8528 100644 (file)
--- a/conf/machine/p5020ds.conf
+++ b/conf/machine/p5020ds.conf
@@ -16,9 +16,6 @@ UBOOT_CONFIG[secure-boot] = "P5020DS_SECURE_BOOT_config"
 UBOOT_CONFIG[sdcard] = "P5020DS_SDCARD_config"
 UBOOT_CONFIG[spi] = "P5020DS_SPIFLASH_config"
 
-
-HV_CFG_M = "p5020ds"
-
 KERNEL_DEVICETREE ?= "p5020ds.dtb p5020ds-usdpaa.dtb \
     p5020ds-usdpaa-shared-interfaces.dtb \
 "

diff --git a/conf/machine/p5040ds-64b.conf b/conf/machine/p5040ds-64b.conf
index cdc69e63c438696790a07c15ba36d947d8694596..de76d939017aa8d14f3bf8c6fc35b4c2fd54e9ea 100644 (file)
--- a/conf/machine/p5040ds-64b.conf
+++ b/conf/machine/p5040ds-64b.conf
@@ -16,9 +16,6 @@ UBOOT_CONFIG[secure-boot] = "P5040DS_SECURE_BOOT_config"
 UBOOT_CONFIG[sdcard] = "P5040DS_SDCARD_config"
 UBOOT_CONFIG[spi] = "P5040DS_SPIFLASH_config"
 
-
-HV_CFG_M = "p5040ds"
-
 KERNEL_DEVICETREE ?= "p5040ds.dtb p5040ds-usdpaa.dtb \
     p5040ds-usdpaa-shared-interfaces.dtb \
 "

diff --git a/conf/machine/p5040ds.conf b/conf/machine/p5040ds.conf
index 93888e1ae66e2f0f7498e49a68abe89d1239a362..77132ede77ad6cc34c2e218874607c25b81cfa5e 100644 (file)
--- a/conf/machine/p5040ds.conf
+++ b/conf/machine/p5040ds.conf
@@ -16,9 +16,6 @@ UBOOT_CONFIG[secure-boot] = "P5040DS_SECURE_BOOT_config"
 UBOOT_CONFIG[sdcard] = "P5040DS_SDCARD_config"
 UBOOT_CONFIG[spi] = "P5040DS_SPIFLASH_config"
 
-
-HV_CFG_M = "p5040ds"
-
 KERNEL_DEVICETREE ?= "p5040ds.dtb p5040ds-usdpaa.dtb \
     p5040ds-usdpaa-shared-interfaces.dtb \
 "

diff --git a/conf/machine/t1024rdb-64b.conf b/conf/machine/t1024rdb-64b.conf
index be9d57a7165e90a53375306ceb237c29481b0f2b..48681cd8a0e6741b91ef42362ccaf66bac8f7087 100644 (file)
--- a/conf/machine/t1024rdb-64b.conf
+++ b/conf/machine/t1024rdb-64b.conf
@@ -16,9 +16,6 @@ UBOOT_CONFIG[sdcard] = "T1024RDB_SDCARD_config"
 UBOOT_CONFIG[spi] = "T1024RDB_SPIFLASH_config"
 UBOOT_CONFIG[secure-boot] = "T1024RDB_SECURE_BOOT_config"
 
-
-HV_CFG_M = "t1024rdb"
-
 KERNEL_DEVICETREE ?= "t1024rdb.dtb t1024rdb-usdpaa.dtb t1024rdb-usdpaa-capwap.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3l_smp_defconfig"
 

diff --git a/conf/machine/t1024rdb.conf b/conf/machine/t1024rdb.conf
index 3a78cd5883733abb0589e74e8540fc618b139518..8f7503825d28cb989627ce7d0b2ca6261603d580 100644 (file)
--- a/conf/machine/t1024rdb.conf
+++ b/conf/machine/t1024rdb.conf
@@ -16,9 +16,6 @@ UBOOT_CONFIG[sdcard] = "T1024RDB_SDCARD_config"
 UBOOT_CONFIG[spi] = "T1024RDB_SPIFLASH_config"
 UBOOT_CONFIG[secure-boot] = "T1024RDB_SECURE_BOOT_config"
 
-
-HV_CFG_M = "t1024rdb"
-
 KERNEL_DEVICETREE ?= "t1024rdb.dtb t1024rdb-usdpaa.dtb t1024rdb-usdpaa-capwap.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3l_smp_defconfig"
 

diff --git a/conf/machine/t1040d4rdb-64b.conf b/conf/machine/t1040d4rdb-64b.conf
index 4ffeed65a05aaa89c85ec59847a392aa88cf82ea..49bf9ac746c69b240c9bca6b389910e27e8498e8 100644 (file)
--- a/conf/machine/t1040d4rdb-64b.conf
+++ b/conf/machine/t1040d4rdb-64b.conf
@@ -16,9 +16,6 @@ UBOOT_CONFIG[sdcard] = "T1040D4RDB_SDCARD_config"
 UBOOT_CONFIG[spi] = "T1040D4RDB_SPIFLASH_config"
 UBOOT_CONFIG[secure-boot] = "T1040D4RDB_SECURE_BOOT_config"
 
-
-HV_CFG_M = "t1040rdb"
-
 KERNEL_DEVICETREE ?= "t1040d4rdb.dtb t1040d4rdb-usdpaa.dtb \
     t1040d4rdb-usdpaa-lag.dtb t1040d4rdb-usdpaa-shared-interfaces.dtb \
 "

diff --git a/conf/machine/t1040d4rdb.conf b/conf/machine/t1040d4rdb.conf
index 50961bb2283730449e6b956ff3f7ec5d60c1eb9c..5f629ed7e1489058b086e80b997422c2ebdebc80 100644 (file)
--- a/conf/machine/t1040d4rdb.conf
+++ b/conf/machine/t1040d4rdb.conf
@@ -16,9 +16,6 @@ UBOOT_CONFIG[sdcard] = "T1040D4RDB_SDCARD_config"
 UBOOT_CONFIG[spi] = "T1040D4RDB_SPIFLASH_config"
 UBOOT_CONFIG[secure-boot] = "T1040D4RDB_SECURE_BOOT_config"
 
-
-HV_CFG_M = "t1040rdb"
-
 KERNEL_DEVICETREE ?= "t1040d4rdb.dtb t1040d4rdb-usdpaa.dtb \
     t1040d4rdb-usdpaa-lag.dtb t1040d4rdb-usdpaa-shared-interfaces.dtb \
 "

diff --git a/conf/machine/t1042d4rdb-64b.conf b/conf/machine/t1042d4rdb-64b.conf
index b73273f4aae6206ed9b89120e7436bc42d070272..fd4afb5d64b2f9d1680f7c2b07f2302a983e3797 100644 (file)
--- a/conf/machine/t1042d4rdb-64b.conf
+++ b/conf/machine/t1042d4rdb-64b.conf
@@ -16,9 +16,6 @@ UBOOT_CONFIG[sdcard] = "T1042D4RDB_SDCARD_config"
 UBOOT_CONFIG[spi] = "T1042D4RDB_SPIFLASH_config"
 UBOOT_CONFIG[secure-boot] = "T1042D4RDB_SECURE_BOOT_config"
 
-
-HV_CFG_M = "t1040rdb"
-
 KERNEL_DEVICETREE ?= "t1042d4rdb.dtb t1042d4rdb-usdpaa.dtb \
     t1042d4rdb-usdpaa-shared-interfaces.dtb \
 "

diff --git a/conf/machine/t1042d4rdb.conf b/conf/machine/t1042d4rdb.conf
index 3f496fb6d4d024e3e1fa96e83199e4c369b715fa..5ad5cb2b3259515a2bbe13831608a1aa259ec674 100644 (file)
--- a/conf/machine/t1042d4rdb.conf
+++ b/conf/machine/t1042d4rdb.conf
@@ -16,9 +16,6 @@ UBOOT_CONFIG[sdcard] = "T1042D4RDB_SDCARD_config"
 UBOOT_CONFIG[spi] = "T1042D4RDB_SPIFLASH_config"
 UBOOT_CONFIG[secure-boot] = "T1042D4RDB_SECURE_BOOT_config"
 
-
-HV_CFG_M = "t1040rdb"
-
 KERNEL_DEVICETREE ?= "t1042d4rdb.dtb t1042d4rdb-usdpaa.dtb \
     t1042d4rdb-usdpaa-shared-interfaces.dtb \
 "

diff --git a/conf/machine/t2080qds-64b.conf b/conf/machine/t2080qds-64b.conf
index 969f0986d58d787838dc920578de19f680277a32..8da4582f49ed79c1f2235a72a4ffb994e01de68a 100644 (file)
--- a/conf/machine/t2080qds-64b.conf
+++ b/conf/machine/t2080qds-64b.conf
@@ -17,9 +17,6 @@ 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 \
 "

diff --git a/conf/machine/t2080qds.conf b/conf/machine/t2080qds.conf
index c1fab6c21f5a5d44c47c3fd7812e4c85c344bdee..825e946f4b1a8715006ae226e7476faa0e8cecee 100644 (file)
--- a/conf/machine/t2080qds.conf
+++ b/conf/machine/t2080qds.conf
@@ -17,9 +17,6 @@ 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 \
 "

diff --git a/conf/machine/t2080rdb-64b.conf b/conf/machine/t2080rdb-64b.conf
index 1d3200ec3a9d1db7394c5443391e02b137510727..3a52d4b4c2ccce04b5ed72a388c0ee72a5fe73e5 100644 (file)
--- a/conf/machine/t2080rdb-64b.conf
+++ b/conf/machine/t2080rdb-64b.conf
@@ -17,9 +17,6 @@ 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 \
 "

diff --git a/conf/machine/t2080rdb.conf b/conf/machine/t2080rdb.conf
index ba4b29c97c66ed3f4a12a2fe16785d474aff4a31..43bd557468b145da608f00d2710dc786677e72eb 100644 (file)
--- a/conf/machine/t2080rdb.conf
+++ b/conf/machine/t2080rdb.conf
@@ -17,9 +17,6 @@ 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 \
 "

diff --git a/conf/machine/t4240qds-64b.conf b/conf/machine/t4240qds-64b.conf
index 911c155d7caa82ad38de22550721130325188b4d..1b960c2e9eaa385c7cc5b6290a6e8228e7d6cfd1 100644 (file)
--- a/conf/machine/t4240qds-64b.conf
+++ b/conf/machine/t4240qds-64b.conf
@@ -13,9 +13,6 @@ UBOOT_CONFIG ??= "nor secure-boot"
 UBOOT_CONFIG[nor] = "T4240QDS_config"
 UBOOT_CONFIG[secure-boot] = "T4240QDS_SECURE_BOOT_config"
 
-
-HV_CFG_M = "t4240qds"
-
 KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb \
     t4240qds-usdpaa-shared-interfaces.dtb \
 "

diff --git a/conf/machine/t4240qds.conf b/conf/machine/t4240qds.conf
index 0eff8929e4d1eebf08ec2a9d042e647384ee9da9..2840ac67fae144fc51f71435c76b588127200432 100644 (file)
--- a/conf/machine/t4240qds.conf
+++ b/conf/machine/t4240qds.conf
@@ -13,9 +13,6 @@ UBOOT_CONFIG ??= "nor secure-boot"
 UBOOT_CONFIG[nor] = "T4240QDS_config"
 UBOOT_CONFIG[secure-boot] = "T4240QDS_SECURE_BOOT_config"
 
-
-HV_CFG_M = "t4240qds"
-
 KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb \
     t4240qds-usdpaa-shared-interfaces.dtb \
 "

diff --git a/conf/machine/t4240rdb-64b.conf b/conf/machine/t4240rdb-64b.conf
index 14420dcc952c148e4f6785d5e0d819be9284e8ed..6399c94d9ab0cefcc8f9e5c3338112d59633cef9 100644 (file)
--- a/conf/machine/t4240rdb-64b.conf
+++ b/conf/machine/t4240rdb-64b.conf
@@ -12,9 +12,6 @@ SOC_FAMILY = "t4:t4240"
 UBOOT_CONFIG ??= "nor"
 UBOOT_CONFIG[nor] = "T4240RDB_config"
 
-
-HV_CFG_M = "t4240rdb"
-
 KERNEL_DEVICETREE ?= "t4240rdb.dtb t4240rdb-usdpaa.dtb \
     t4240rdb-usdpaa-shared-interfaces.dtb \
 "

diff --git a/conf/machine/t4240rdb.conf b/conf/machine/t4240rdb.conf
index 9633a6780055217d08bb9a557ad79906e5158698..1e51a404e33d90b7f374bd54f51e3cb989bbe27e 100644 (file)
--- a/conf/machine/t4240rdb.conf
+++ b/conf/machine/t4240rdb.conf
@@ -12,9 +12,6 @@ SOC_FAMILY = "t4:t4240"
 UBOOT_CONFIG ??= "nor"
 UBOOT_CONFIG[nor] = "T4240RDB_config"
 
-
-HV_CFG_M = "t4240rdb"
-
 KERNEL_DEVICETREE ?= "t4240rdb.dtb t4240rdb-usdpaa.dtb \
     t4240rdb-usdpaa-shared-interfaces.dtb \
 "

diff --git a/recipes-virtualization/hv-cfg/hv-cfg_git.bb b/recipes-virtualization/hv-cfg/hv-cfg_git.bb
index 57cba44a2df8b12349a57f7bca7f9f1f3eee8a81..4f147d2df1f400a716a739d176ee4f71eb7ec327 100644 (file)
--- 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