diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2012-09-17 15:59:22 -0300 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2012-09-17 15:59:22 -0300 |
| commit | 43cb4919a4ccd4718eb657b9f912c911825153fe (patch) | |
| tree | f2dc52509f8f620ed74cdc985fd9221e99d31d00 | |
| parent | b98ce8665826a2b12e1674297d556d4944603dc9 (diff) | |
| parent | a617c5b048a69b8c2d026305cadb3b598e7c93cf (diff) | |
| download | meta-fsl-arm-43cb4919a4ccd4718eb657b9f912c911825153fe.tar.gz | |
Merge remote branch 'freescale/denzil'
* freescale/denzil:
imx6qsabrelite: force MACHINE_GSTREAMER_PLUGIN until codecs are available
| -rw-r--r-- | conf/machine/imx6qsabrelite.conf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/conf/machine/imx6qsabrelite.conf b/conf/machine/imx6qsabrelite.conf index 85b0bc9..2528142 100644 --- a/conf/machine/imx6qsabrelite.conf +++ b/conf/machine/imx6qsabrelite.conf | |||
| @@ -10,6 +10,9 @@ SOC_FAMILY = "mx6" | |||
| 10 | 10 | ||
| 11 | KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6q-sabrelite.dts" | 11 | KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6q-sabrelite.dts" |
| 12 | 12 | ||
| 13 | # no GST until codecs are public | ||
| 14 | MACHINE_GSTREAMER_PLUGIN = "" | ||
| 15 | |||
| 13 | UBOOT_ENTRYPOINT = "0x10800000" | 16 | UBOOT_ENTRYPOINT = "0x10800000" |
| 14 | UBOOT_LOADADDRESS = "0x10800000" | 17 | UBOOT_LOADADDRESS = "0x10800000" |
| 15 | UBOOT_MACHINE = "mx6qsabrelite_config" | 18 | UBOOT_MACHINE = "mx6qsabrelite_config" |