fix MACHINE_FEATURES.

diff --git a/meta-bsp/bm750/conf/machine/bm750.conf b/meta-bsp/bm750/conf/machine/bm750.conf
index 41b4522..f94f205 100644 (file)
--- a/meta-bsp/bm750/conf/machine/bm750.conf
+++ b/meta-bsp/bm750/conf/machine/bm750.conf
@@ -2,11 +2,6 @@
 #@NAME: Vu+ Duo
 #@DESCRIPTION: Machine configuration for Vu+ Duo.
 
 #@NAME: Vu+ Duo
 #@DESCRIPTION: Machine configuration for Vu+ Duo.
 

-#MACHINE_FEATURES += "kernel26"
-MACHINE_FEATURES += "pci"
-MACHINE_FEATURES += "alsa"
-MACHINE_FEATURES += "wifi"
-MACHINE_FEATURES += "vuwlan"

 MACHINE_FEATURES += "display-text-vfd"
 VUPLUS_FEATURES = "fan_simple"
 
 MACHINE_FEATURES += "display-text-vfd"
 VUPLUS_FEATURES = "fan_simple"
 

diff --git a/meta-bsp/common/conf/machine/include/vuplus.inc b/meta-bsp/common/conf/machine/include/vuplus.inc
index 1a5080b..39559e1 100644 (file)
--- a/meta-bsp/common/conf/machine/include/vuplus.inc
+++ b/meta-bsp/common/conf/machine/include/vuplus.inc
@@ -6,7 +6,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "vuplus-bootlogo"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "vuplus-dvb-modules"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "task-vuplus-essential"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "vuplus-bootlogo"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "vuplus-dvb-modules"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "task-vuplus-essential"

-MACHINE_FEATURES += "alsa kernel26 wifi"
+MACHINE_FEATURES += "kernel26 alsa pci wifi vuwlan"

 
 PREFERRED_PROVIDER_virtual/kernel = "linux-vuplus"
 
 
 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 da58b70..c57f381 100644 (file)
--- a/meta-bsp/vuduo2/conf/machine/vuduo2.conf
+++ b/meta-bsp/vuduo2/conf/machine/vuduo2.conf
@@ -2,11 +2,6 @@
 #@NAME: Vu+ duo2
 #@DESCRIPTION: Machine configuration for Vu+ duo2.
 
 #@NAME: Vu+ duo2
 #@DESCRIPTION: Machine configuration for Vu+ duo2.
 

-#MACHINE_FEATURES += "kernel26"
-MACHINE_FEATURES += "pci"
-MACHINE_FEATURES += "alsa"
-MACHINE_FEATURES += "wifi"
-MACHINE_FEATURES += "vuwlan"

 MACHINE_FEATURES += "display-graphic-vfd"
 MACHINE_FEATURES += "enable-rc-kbd"
 VUPLUS_FEATURES = "fan_manual rc_code "
 MACHINE_FEATURES += "display-graphic-vfd"
 MACHINE_FEATURES += "enable-rc-kbd"
 VUPLUS_FEATURES = "fan_manual rc_code "

diff --git a/meta-bsp/vusolo/conf/machine/vusolo.conf b/meta-bsp/vusolo/conf/machine/vusolo.conf
index 9e62deb..159106b 100644 (file)
--- a/meta-bsp/vusolo/conf/machine/vusolo.conf
+++ b/meta-bsp/vusolo/conf/machine/vusolo.conf
@@ -2,11 +2,6 @@
 #@NAME: Vu+ Solo
 #@DESCRIPTION: Machine configuration for Vu+ Solo.
 
 #@NAME: Vu+ Solo
 #@DESCRIPTION: Machine configuration for Vu+ Solo.
 

-#MACHINE_FEATURES += "kernel26"
-MACHINE_FEATURES += "pci"
-MACHINE_FEATURES += "alsa"
-MACHINE_FEATURES += "wifi"
-MACHINE_FEATURES += "vuwlan"

 VUPLUS_FEATURES = ""
 
 IMAGE_UNPACK_PATH = "vuplus/solo"
 VUPLUS_FEATURES = ""
 
 IMAGE_UNPACK_PATH = "vuplus/solo"

diff --git a/meta-bsp/vusolo2/conf/machine/vusolo2.conf b/meta-bsp/vusolo2/conf/machine/vusolo2.conf
index 119b3e5..e9997ec 100644 (file)
--- a/meta-bsp/vusolo2/conf/machine/vusolo2.conf
+++ b/meta-bsp/vusolo2/conf/machine/vusolo2.conf
@@ -2,16 +2,8 @@
 #@NAME: Vu+ solo2
 #@DESCRIPTION: Machine configuration for Vu+ solo2.
 
 #@NAME: Vu+ solo2
 #@DESCRIPTION: Machine configuration for Vu+ solo2.
 

-#MACHINE_FEATURES += "kernel26"
-MACHINE_FEATURES += "pci"
-MACHINE_FEATURES += "alsa"
-MACHINE_FEATURES += "wifi"
-MACHINE_FEATURES += "vuwlan"
-#MACHINE_FEATURES += "display-graphic-vfd"

 MACHINE_FEATURES += "display-text-vfd"
 MACHINE_FEATURES += "display-text-vfd"

-#MACHINE_FEATURES += "right-half-vfd-skin"

 MACHINE_FEATURES += "enable-rc-kbd"
 MACHINE_FEATURES += "enable-rc-kbd"

-#VUPLUS_FEATURES = "fan_manual rc_code led"

 VUPLUS_FEATURES = "fan_manual rc_code "
 
 IMAGE_UNPACK_PATH = "vuplus/solo2"
 VUPLUS_FEATURES = "fan_manual rc_code "
 
 IMAGE_UNPACK_PATH = "vuplus/solo2"

diff --git a/meta-bsp/vuultimo/conf/machine/vuultimo.conf b/meta-bsp/vuultimo/conf/machine/vuultimo.conf
index f42e7f3..416635c 100644 (file)
--- a/meta-bsp/vuultimo/conf/machine/vuultimo.conf
+++ b/meta-bsp/vuultimo/conf/machine/vuultimo.conf
@@ -2,11 +2,6 @@
 #@NAME: Vu+ ultimo
 #@DESCRIPTION: Machine configuration for Vu+ ultimo.
 
 #@NAME: Vu+ ultimo
 #@DESCRIPTION: Machine configuration for Vu+ ultimo.
 

-#MACHINE_FEATURES += "kernel26"
-MACHINE_FEATURES += "pci"
-MACHINE_FEATURES += "alsa"
-MACHINE_FEATURES += "wifi"
-MACHINE_FEATURES += "vuwlan"

 MACHINE_FEATURES += "display-graphic-vfd"
 MACHINE_FEATURES += "right-half-vfd-skin"
 MACHINE_FEATURES += "enable-rc-kbd"
 MACHINE_FEATURES += "display-graphic-vfd"
 MACHINE_FEATURES += "right-half-vfd-skin"
 MACHINE_FEATURES += "enable-rc-kbd"

diff --git a/meta-bsp/vuuno/conf/machine/vuuno.conf b/meta-bsp/vuuno/conf/machine/vuuno.conf
index f425864..f6ba558 100644 (file)
--- a/meta-bsp/vuuno/conf/machine/vuuno.conf
+++ b/meta-bsp/vuuno/conf/machine/vuuno.conf
@@ -2,11 +2,6 @@
 #@NAME: Vu+ Uno
 #@DESCRIPTION: Machine configuration for Vu+ Uno.
 
 #@NAME: Vu+ Uno
 #@DESCRIPTION: Machine configuration for Vu+ Uno.
 

-#MACHINE_FEATURES += "kernel26"
-MACHINE_FEATURES += "pci"
-MACHINE_FEATURES += "alsa"
-MACHINE_FEATURES += "wifi"
-MACHINE_FEATURES += "vuwlan"

 MACHINE_FEATURES += "display-text-vfd"
 VUPLUS_FEATURES = "fan_manual rc_code"
 
 MACHINE_FEATURES += "display-text-vfd"
 VUPLUS_FEATURES = "fan_manual rc_code"