1 files changed, 4 insertions, 8 deletions

diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf
index e714a948..86491899 100644
--- a/meta-crownbay/conf/machine/crownbay.conf
+++ b/meta-crownbay/conf/machine/crownbay.conf
@@ -14,6 +14,10 @@ require conf/machine/include/meta-intel.inc
 
 MACHINE_FEATURES += "va-impl-mixvideo"
 
+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} \
@@ -25,11 +29,3 @@ PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
 PREFERRED_VERSION_emgd-driver-bin ?= "1.16"
 
 APPEND += "video=vesafb vga=0x318 vmalloc=256MB"
-
-# 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}"