24 files changed, 2 insertions, 74 deletions

diff --git a/conf/machine/b4860qds-64b.conf b/conf/machine/b4860qds-64b.conf
index ff99d2a3..6ace6433 100644
--- 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 95d3ce83..b8b46236 100644
--- 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 9b91a2cd..a3ecac5b 100644
--- 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 13d8530b..8b2bb1da 100644
--- 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 fe160272..1bbe9053 100644
--- 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 223031de..54cca65a 100644
--- 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 9113e2c1..e25e3dd1 100644
--- 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 cdc69e63..de76d939 100644
--- 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 93888e1a..77132ede 100644
--- 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 be9d57a7..48681cd8 100644
--- 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 3a78cd58..8f750382 100644
--- 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 4ffeed65..49bf9ac7 100644
--- 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 50961bb2..5f629ed7 100644
--- 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 b73273f4..fd4afb5d 100644
--- 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 3f496fb6..5ad5cb2b 100644
--- 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 969f0986..8da4582f 100644
--- 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 c1fab6c2..825e946f 100644
--- 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 1d3200ec..3a52d4b4 100644
--- 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 ba4b29c9..43bd5574 100644
--- 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 911c155d..1b960c2e 100644
--- 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 0eff8929..2840ac67 100644
--- 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 14420dcc..6399c94d 100644
--- 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 9633a678..1e51a404 100644
--- 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 57cba44a..4f147d2d 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