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}"