From 6eed0090597bfe82603be5ffa9c9f1fd141306f0 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Tue, 18 Sep 2012 12:16:07 -0700 Subject: emenlow: use emgd instead of psb for graphics driver Remove all the Poulsbo graphics driver specific meta data files. And configure the BSP to use EMGD instead of psb for graphics stack. Signed-off-by: Nitin A Kamble Signed-off-by: Tom Zanussi --- meta-emenlow/conf/machine/emenlow.conf | 35 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 20 deletions(-) (limited to 'meta-emenlow/conf') diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf index 1a4aa812..235498ce 100644 --- a/meta-emenlow/conf/machine/emenlow.conf +++ b/meta-emenlow/conf/machine/emenlow.conf @@ -10,27 +10,22 @@ PREFERRED_VERSION_linux-yocto ?= "3.4%" require conf/machine/include/tune-atom.inc require conf/machine/include/ia32-base.inc +require conf/machine/include/meta-intel.inc -PREFERRED_PROVIDER_libdrm = "libdrm-poulsbo" -PREFERRED_PROVIDER_drm = "libdrm-poulsbo" -PREFERRED_PROVIDER_virtual/libgl = "xpsb-glx" -PREFERRED_PROVIDER_virtual/libgles1 = "" -PREFERRED_PROVIDER_virtual/libgles2 = "" -PREFERRED_PROVIDER_virtual/xserver = "xserver-psb" -PREFERRED_PROVIDER_virtual/xserver-xf86 = "xserver-psb" -PREFERRED_PROVIDER_mesa-dri = "xpsb-glx" -PREFERRED_VERSION_libva ?= "0.31.0" +MACHINE_FEATURES += "va-impl-mixvideo" + +XSERVER ?= "${XSERVER_IA32_BASE} \ + ${XSERVER_IA32_EXT} \ + ${XSERVER_IA32_EMGD} \ + " + +PREFERRED_VERSION_xserver-xorg ?= "1.9.3" +PREFERRED_VERSION_mesa-dri ?= "7.11" PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" -PREFERRED_VERSION_cairo ?= "1.10.2" -XSERVER ?= "xserver-psb \ - xserver-psb-extension-dri \ - xserver-psb-extension-dri2 \ - xserver-psb-extension-glx \ - xserver-psb-extension-extmod \ - xserver-psb-extension-dbe \ - xserver-psb-module-libint10 \ - xf86-input-mouse \ - xf86-input-keyboard \ - xf86-input-evdev" APPEND += "video=vesafb vga=0x318" + +VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ + "commercial", "gst-va-intel va-intel", "va-intel", d)}" + +MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" -- cgit v1.2.3-54-g00ecf