Merge branch 'master' of 192.168.102.66:/opt/repository/openvuplus

diff --git a/meta-bsp/bm750/conf/machine/bm750.conf b/meta-bsp/bm750/conf/machine/bm750.conf
index f94f205..542cabd 100644 (file)
--- a/meta-bsp/bm750/conf/machine/bm750.conf
+++ b/meta-bsp/bm750/conf/machine/bm750.conf
@@ -5,6 +5,13 @@
 MACHINE_FEATURES += "display-text-vfd"
 VUPLUS_FEATURES = "fan_simple"
 
+VUPLUS_FEATURES += "blindscan"
+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/vuduo2/conf/machine/vuduo2.conf b/meta-bsp/vuduo2/conf/machine/vuduo2.conf
index c57f381..4692b17 100644 (file)
--- a/meta-bsp/vuduo2/conf/machine/vuduo2.conf
+++ b/meta-bsp/vuduo2/conf/machine/vuduo2.conf
@@ -6,6 +6,13 @@ MACHINE_FEATURES += "display-graphic-vfd"
 MACHINE_FEATURES += "enable-rc-kbd"
 VUPLUS_FEATURES = "fan_manual rc_code "
 
+VUPLUS_FEATURES += "firmwareupgrade"
+VUPLUS_FEATURES += "blindscan"
+VUPLUS_FEATURES += "hbbtv"
+VUPLUS_FEATURES += "streamtv"
+VUPLUS_FEATURES += "dlna"
+VUPLUS_FEATURES += "3gmodem"
+
 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 159106b..3151690 100644 (file)
--- a/meta-bsp/vusolo/conf/machine/vusolo.conf
+++ b/meta-bsp/vusolo/conf/machine/vusolo.conf
@@ -3,6 +3,10 @@
 #@DESCRIPTION: Machine configuration for Vu+ Solo.
 
 VUPLUS_FEATURES = ""
+VUPLUS_FEATURES += "blindscan"
+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 e9997ec..5e420e2 100644 (file)
--- a/meta-bsp/vusolo2/conf/machine/vusolo2.conf
+++ b/meta-bsp/vusolo2/conf/machine/vusolo2.conf
@@ -6,6 +6,13 @@ MACHINE_FEATURES += "display-text-vfd"
 MACHINE_FEATURES += "enable-rc-kbd"
 VUPLUS_FEATURES = "fan_manual rc_code "
 
+VUPLUS_FEATURES += "firmwareupgrade"
+VUPLUS_FEATURES += "blindscan"
+VUPLUS_FEATURES += "hbbtv"
+VUPLUS_FEATURES += "streamtv"
+VUPLUS_FEATURES += "dlna"
+VUPLUS_FEATURES += "3gmodem"
+
 IMAGE_UNPACK_PATH = "vuplus/solo2"
 MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096"
 

diff --git a/meta-bsp/vuuno/conf/machine/vuuno.conf b/meta-bsp/vuuno/conf/machine/vuuno.conf
index f6ba558..ba669e7 100644 (file)
--- a/meta-bsp/vuuno/conf/machine/vuuno.conf
+++ b/meta-bsp/vuuno/conf/machine/vuuno.conf
@@ -5,6 +5,13 @@
 MACHINE_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"
+
 IMAGE_UNPACK_PATH = "vuplus/uno"
 MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096"