From: Otavio Salvador <otavio@ossystems.com.br>
Date: Mon, 17 Sep 2012 19:13:24 +0000 (-0300)
Subject: Merge remote branch 'freescale/denzil'
X-Git-Tag: 2.1~1715
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=db121b185408bee72c669a563c0e04fa08557693;p=meta-freescale.git

Merge remote branch 'freescale/denzil'

* freescale/denzil:
  imx6qsabrelite: Use xserver-xorg instead of xserver-xorg-lite
  cogl: Use OpenGL ES2 for mx5 SoCs
  imx-base.inc: Set preferred implementation of virtual/libgl for mx5 SoCs
  amd-gpu-x11-bin-mx51: Add provides to 'virtual/libgl'
---

db121b185408bee72c669a563c0e04fa08557693
diff --cc meta-fsl-arm/conf/machine/imx6qsabrelite.conf
index 25281422,b1daeab8..e10229ae
--- a/meta-fsl-arm/conf/machine/imx6qsabrelite.conf
+++ b/meta-fsl-arm/conf/machine/imx6qsabrelite.conf
@@@ -8,11 -8,6 +8,8 @@@ include conf/machine/include/tune-corte
  
  SOC_FAMILY = "mx6"
  
 +KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6q-sabrelite.dts"
 +
- # no GST until codecs are public
- MACHINE_GSTREAMER_PLUGIN = ""
- 
  UBOOT_ENTRYPOINT =  "0x10800000"
  UBOOT_LOADADDRESS = "0x10800000"
  UBOOT_MACHINE = "mx6qsabrelite_config"