fix MACHINE_FEATURES/VUPLUS_FEATURES.

7 files changed, 60 insertions, 58 deletions

diff --git a/meta-bsp/bm750/conf/machine/bm750.conf b/meta-bsp/bm750/conf/machine/bm750.conf
index f31df23..711fde0 100644
--- a/meta-bsp/bm750/conf/machine/bm750.conf
+++ b/meta-bsp/bm750/conf/machine/bm750.conf
@@ -2,14 +2,13 @@
 #@NAME: Vu+ Duo
 #@DESCRIPTION: Machine configuration for Vu+ Duo.
 
-MACHINE_FEATURES += "display-text-vfd"
-MACHINE_FEATURES = "fan_simple"
-
-MACHINE_FEATURES += "hbbtv"
-MACHINE_FEATURES += "streamtv"
-MACHINE_FEATURES += "dlna"
-MACHINE_FEATURES += "3gmodem"
-
+VUPLUS_FEATURES += "vuwlan"
+VUPLUS_FEATURES += "display-text-vfd"
+VUPLUS_FEATURES += "fan_simple"
+VUPLUS_FEATURES += "hbbtv"
+VUPLUS_FEATURES += "streamtv"
+VUPLUS_FEATURES += "dlna"
+VUPLUS_FEATURES += "3gmodem"
 
 IMAGE_UNPACK_PATH = "vuplus/duo"
 MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096"
diff --git a/meta-bsp/common/conf/machine/include/vuplus.inc b/meta-bsp/common/conf/machine/include/vuplus.inc
index a66dc11..4234382 100644
--- a/meta-bsp/common/conf/machine/include/vuplus.inc
+++ b/meta-bsp/common/conf/machine/include/vuplus.inc
@@ -5,7 +5,7 @@ GLIBC_EXTRA_OECONF = "--with-tls --with-__thread"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "vuplus-bootlogo"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "vuplus-dvb-modules"
-MACHINE_FEATURES += "kernel26 alsa pci wifi vuwlan"
+MACHINE_FEATURES += "kernel26 alsa pci wifi"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-vuplus"
 
diff --git a/meta-bsp/vuduo2/conf/machine/vuduo2.conf b/meta-bsp/vuduo2/conf/machine/vuduo2.conf
index d657abe..43cb360 100644
--- a/meta-bsp/vuduo2/conf/machine/vuduo2.conf
+++ b/meta-bsp/vuduo2/conf/machine/vuduo2.conf
@@ -2,19 +2,20 @@
 #@NAME: Vu+ duo2
 #@DESCRIPTION: Machine configuration for Vu+ duo2.
 
-MACHINE_FEATURES += "display-graphic-vfd"
-MACHINE_FEATURES += "enable-rc-kbd"
-MACHINE_FEATURES = "fan_manual rc_code "
+VUPLUS_FEATURES += "vuwlan"
+VUPLUS_FEATURES += "display-graphic-vfd"
+VUPLUS_FEATURES += "enable-rc-kbd"
+VUPLUS_FEATURES += "fan_manual rc_code "
 
-MACHINE_FEATURES += "firmwareupgrade"
-MACHINE_FEATURES += "blindscan"
-MACHINE_FEATURES += "hbbtv"
-MACHINE_FEATURES += "streamtv"
-MACHINE_FEATURES += "dlna"
-MACHINE_FEATURES += "3gmodem"
-MACHINE_FEATURES += "webif"
-MACHINE_FEATURES += "autoshutdown"
-MACHINE_FEATURES += "transcoding"
+VUPLUS_FEATURES += "firmwareupgrade"
+VUPLUS_FEATURES += "blindscan"
+VUPLUS_FEATURES += "hbbtv"
+VUPLUS_FEATURES += "streamtv"
+VUPLUS_FEATURES += "dlna"
+VUPLUS_FEATURES += "3gmodem"
+VUPLUS_FEATURES += "webif"
+VUPLUS_FEATURES += "autoshutdown"
+VUPLUS_FEATURES += "transcoding"
 
 IMAGE_UNPACK_PATH = "vuplus/duo2"
 MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096"
diff --git a/meta-bsp/vusolo/conf/machine/vusolo.conf b/meta-bsp/vusolo/conf/machine/vusolo.conf
index 884c015..b7ab26f 100644
--- a/meta-bsp/vusolo/conf/machine/vusolo.conf
+++ b/meta-bsp/vusolo/conf/machine/vusolo.conf
@@ -2,10 +2,10 @@
 #@NAME: Vu+ Solo
 #@DESCRIPTION: Machine configuration for Vu+ Solo.
 
-MACHINE_FEATURES = ""
-MACHINE_FEATURES += "streamtv"
-MACHINE_FEATURES += "dlna"
-MACHINE_FEATURES += "3gmodem"
+VUPLUS_FEATURES += "vuwlan"
+VUPLUS_FEATURES += "streamtv"
+VUPLUS_FEATURES += "dlna"
+VUPLUS_FEATURES += "3gmodem"
 
 IMAGE_UNPACK_PATH = "vuplus/solo"
 MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096"
diff --git a/meta-bsp/vusolo2/conf/machine/vusolo2.conf b/meta-bsp/vusolo2/conf/machine/vusolo2.conf
index 8d4b1cd..ef7456b 100644
--- a/meta-bsp/vusolo2/conf/machine/vusolo2.conf
+++ b/meta-bsp/vusolo2/conf/machine/vusolo2.conf
@@ -2,19 +2,20 @@
 #@NAME: Vu+ solo2
 #@DESCRIPTION: Machine configuration for Vu+ solo2.
 
-MACHINE_FEATURES += "display-text-vfd"
-MACHINE_FEATURES += "enable-rc-kbd"
-MACHINE_FEATURES = "fan_manual rc_code "
+VUPLUS_FEATURES += "vuwlan"
+VUPLUS_FEATURES += "display-text-vfd"
+VUPLUS_FEATURES += "enable-rc-kbd"
+VUPLUS_FEATURES += "fan_manual rc_code "
 
-MACHINE_FEATURES += "firmwareupgrade"
-MACHINE_FEATURES += "webmanual"
-MACHINE_FEATURES += "hbbtv"
-MACHINE_FEATURES += "streamtv"
-MACHINE_FEATURES += "dlna"
-MACHINE_FEATURES += "3gmodem"
-MACHINE_FEATURES += "webif"
-MACHINE_FEATURES += "autoshutdown"
-MACHINE_FEATURES += "transcoding"
+VUPLUS_FEATURES += "firmwareupgrade"
+VUPLUS_FEATURES += "webmanual"
+VUPLUS_FEATURES += "hbbtv"
+VUPLUS_FEATURES += "streamtv"
+VUPLUS_FEATURES += "dlna"
+VUPLUS_FEATURES += "3gmodem"
+VUPLUS_FEATURES += "webif"
+VUPLUS_FEATURES += "autoshutdown"
+VUPLUS_FEATURES += "transcoding"
 
 IMAGE_UNPACK_PATH = "vuplus/solo2"
 MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096"
diff --git a/meta-bsp/vuultimo/conf/machine/vuultimo.conf b/meta-bsp/vuultimo/conf/machine/vuultimo.conf
index 4c35267..6e8bf9a 100644
--- a/meta-bsp/vuultimo/conf/machine/vuultimo.conf
+++ b/meta-bsp/vuultimo/conf/machine/vuultimo.conf
@@ -2,18 +2,19 @@
 #@NAME: Vu+ ultimo
 #@DESCRIPTION: Machine configuration for Vu+ ultimo.
 
-MACHINE_FEATURES += "display-graphic-vfd"
-MACHINE_FEATURES += "right-half-vfd-skin"
-MACHINE_FEATURES += "enable-rc-kbd"
-MACHINE_FEATURES = "fan_manual rc_code led"
+VUPLUS_FEATURES += "vuwlan"
+VUPLUS_FEATURES += "display-graphic-vfd"
+VUPLUS_FEATURES += "right-half-vfd-skin"
+VUPLUS_FEATURES += "enable-rc-kbd"
+VUPLUS_FEATURES += "fan_manual rc_code led"
 
-MACHINE_FEATURES += "blindscan"
-MACHINE_FEATURES += "firmwareupgrade"
-MACHINE_FEATURES += "hbbtv"
-MACHINE_FEATURES += "streamtv"
-MACHINE_FEATURES += "dlna"
-MACHINE_FEATURES += "3gmodem"
-MACHINE_FEATURES += "vuplus-fpga-update"
+VUPLUS_FEATURES += "blindscan"
+VUPLUS_FEATURES += "firmwareupgrade"
+VUPLUS_FEATURES += "hbbtv"
+VUPLUS_FEATURES += "streamtv"
+VUPLUS_FEATURES += "dlna"
+VUPLUS_FEATURES += "3gmodem"
+VUPLUS_FEATURES += "vuplus-fpga-update"
 
 IMAGE_UNPACK_PATH = "vuplus/ultimo"
 MKFS_UBI_MAX_ERASE_BLK_COUNT = "3894"
diff --git a/meta-bsp/vuuno/conf/machine/vuuno.conf b/meta-bsp/vuuno/conf/machine/vuuno.conf
index 9a708a3..88f2f65 100644
--- a/meta-bsp/vuuno/conf/machine/vuuno.conf
+++ b/meta-bsp/vuuno/conf/machine/vuuno.conf
@@ -2,16 +2,16 @@
 #@NAME: Vu+ Uno
 #@DESCRIPTION: Machine configuration for Vu+ Uno.
 
-MACHINE_FEATURES += "display-text-vfd"
-MACHINE_FEATURES = "fan_manual rc_code"
-
-MACHINE_FEATURES += "blindscan"
-MACHINE_FEATURES += "hbbtv"
-MACHINE_FEATURES += "streamtv"
-MACHINE_FEATURES += "dlna"
-MACHINE_FEATURES += "3gmodem"
-MACHINE_FEATURES += "fpgaupgrade"
-MACHINE_FEATURES += "vuplus-fpga-update"
+VUPLUS_FEATURES += "vuwlan"
+VUPLUS_FEATURES += "display-text-vfd"
+VUPLUS_FEATURES += "fan_manual rc_code"
+VUPLUS_FEATURES += "blindscan"
+VUPLUS_FEATURES += "hbbtv"
+VUPLUS_FEATURES += "streamtv"
+VUPLUS_FEATURES += "dlna"
+VUPLUS_FEATURES += "3gmodem"
+VUPLUS_FEATURES += "fpgaupgrade"
+VUPLUS_FEATURES += "vuplus-fpga-update"
 
 IMAGE_UNPACK_PATH = "vuplus/uno"
 MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096"