aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2013-01-24 17:39:45 -0800
committerTom Zanussi <tom.zanussi@intel.com>2013-01-24 22:51:27 -0600
commit4f676959c35cbd0ed9ac6a1817993d38611859e1 (patch)
treef534b6221f2659fe1823633d91e9556f0134dbe9
parent521a8a6bc41bc11bd29b60b5f90a495a38a3bed0 (diff)
downloadmeta-intel-4f676959c35cbd0ed9ac6a1817993d38611859e1.tar.gz
meta-intel-4f676959c35cbd0ed9ac6a1817993d38611859e1.tar.bz2
meta-intel-4f676959c35cbd0ed9ac6a1817993d38611859e1.zip
sys940x.conf: use the new method for specifying VA codecs1.4_M3.rc21.4_M3.final1.4_M3
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-sys940x/conf/machine/sys940x.conf12
1 files changed, 4 insertions, 8 deletions
diff --git a/meta-sys940x/conf/machine/sys940x.conf b/meta-sys940x/conf/machine/sys940x.conf
index e47c720c..bc03db0f 100644
--- a/meta-sys940x/conf/machine/sys940x.conf
+++ b/meta-sys940x/conf/machine/sys940x.conf
@@ -14,6 +14,10 @@ MACHINE_FEATURES += "efi pcbios gst-va-mixvideo"
PREFERRED_VERSION_linux-yocto ?= "3.4%"
+MACHINE_HWCODECS ?= "va-intel"
+XSERVERCODECS ?= "emgd-driver-video emgd-gst-plugins-va \
+ emgd-gst-plugins-mixvideo gst-va-intel"
+
XSERVER ?= "${XSERVER_IA32_BASE} \
${XSERVER_IA32_EXT} \
${XSERVER_IA32_EMGD} \
@@ -26,11 +30,3 @@ PREFERRED_VERSION_emgd-driver-bin ?= "1.14"
SERIAL_CONSOLE = "115200 ttyS0"
APPEND += "console=ttyS0,115200 console=tty0"
-
-# 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_EXTRA_RRECOMMENDS += "${VA_FEATURES}"