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

Merge remote branch 'freescale/denzil'

* freescale/denzil:
  imx6qsabrelite: force MACHINE_GSTREAMER_PLUGIN until codecs are available
---

dc3c9a56316946d6267dd0e8d915126e2ebf3955
diff --cc meta-fsl-arm/conf/machine/imx6qsabrelite.conf
index 85b0bc92,06ec230a..25281422
--- a/meta-fsl-arm/conf/machine/imx6qsabrelite.conf
+++ b/meta-fsl-arm/conf/machine/imx6qsabrelite.conf
@@@ -8,8 -8,9 +8,11 @@@ 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"