aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2013-01-24 17:38:02 -0800
committerTom Zanussi <tom.zanussi@intel.com>2013-01-24 22:51:13 -0600
commit521a8a6bc41bc11bd29b60b5f90a495a38a3bed0 (patch)
tree2d35e8d0340e14161fc6ad055541fab45297db5e
parentf3bccf8f0c91b4edff480327895dff5efb792f82 (diff)
downloadmeta-intel-521a8a6bc41bc11bd29b60b5f90a495a38a3bed0.tar.gz
meta-intel-521a8a6bc41bc11bd29b60b5f90a495a38a3bed0.tar.bz2
meta-intel-521a8a6bc41bc11bd29b60b5f90a495a38a3bed0.zip
fri2.conf: use the new method for specifying VA codecs
This replaces the old VA_FEATURES method to specify the codecs. These VA codecs are included in the image when image has 'hwcodec' in the IMAGE_FEATURES. And one can disable the VA features by redefining the IMAGE_FEATURES var in the local.conf . The gst-va-intel package pulls in emgd driver and x11 pieces, hence it is moved to the XSERVERCODECS var. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
-rw-r--r--meta-fri2/conf/machine/fri2.conf10
1 files changed, 4 insertions, 6 deletions
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index 12184b21..40f2cdca 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -9,14 +9,12 @@ require conf/machine/include/tune-atom.inc
require conf/machine/include/ia32-base.inc
require conf/machine/include/meta-intel.inc
-# Some of the EMGD components have dependency on libx11.
-# Add these only when Xserver is enabled with the EMGD driver
-# Otherwise unwanted X components will start showing up in the non-X images
-VA_FEATURES ?= "gst-va-intel va-intel \
- ${@bb.utils.contains("XSERVER", "emgd-driver-bin", "emgd-driver-video emgd-gst-plugins-va emgd-gst-plugins-mixvideo", "", d)}"
+MACHINE_HWCODECS ?= "va-intel"
+XSERVERCODECS ?= "emgd-driver-video emgd-gst-plugins-va \
+ emgd-gst-plugins-mixvideo gst-va-intel"
MACHINE_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo"
-MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}"
+MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
PREFERRED_VERSION_linux-yocto = "3.4%"