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'

diff --cc meta-fsl-arm/conf/machine/imx6qsabrelite.conf
index 25281422c4e574d3bd8a1330773f93f5afd76a9e,b1daeab8956a46f59eb32d0cf27dce8ba67c6cb3..e10229ae3887396867cceb7bbae11b44a58757ef
--- 1/meta-fsl-arm/conf/machine/imx6qsabrelite.conf
--- 2/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"
  
- # no GST until codecs are public
- MACHINE_GSTREAMER_PLUGIN = ""
- 
 +KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6q-sabrelite.dts"
 +
  UBOOT_ENTRYPOINT =  "0x10800000"
  UBOOT_LOADADDRESS = "0x10800000"
  UBOOT_MACHINE = "mx6qsabrelite_config"

diff --cc meta-fsl-arm/conf/machine/include/imx-base.inc
Simple merge