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