From eff6d3c945a892ebced67ce7fe46b818e0e21ed5 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Mon, 10 Sep 2018 16:23:14 +0200 Subject: imx6, imx6ull, imx7: Set PREFERRED_VERSION for Gstreamer to use i.MX Version This is required since meta-freescale commit a4158e3425a7 ("gstreamer1.0: Set DEFAULT_PREFERENCE as -1 to imx version") et. al. and is analogous to meta-freescale-distro commit 29e7a3d322c7 ("fsl-base.inc: Set PREFERRED_VERSION for Gstreamer to use i.MX Version" ). Colibri iMX6ULL and Colibri iMX7 were added as according to the i.MX Reference Manual L4.1.15_2.1.0-ga they at least could profit from the Pixel Pipeline (PxP) DMA-ENGINE driver. Signed-off-by: Marcel Ziswiler Acked-by: Max Krummenacher --- conf/machine/include/apalis-imx6.inc | 6 ++++++ conf/machine/include/colibri-imx6.inc | 6 ++++++ conf/machine/include/colibri-imx6ull.inc | 6 ++++++ conf/machine/include/colibri-imx7-emmc.inc | 6 ++++++ conf/machine/include/colibri-imx7.inc | 6 ++++++ 5 files changed, 30 insertions(+) diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc index c3466c3..88e5259 100644 --- a/conf/machine/include/apalis-imx6.inc +++ b/conf/machine/include/apalis-imx6.inc @@ -13,3 +13,9 @@ UBOOT_SUFFIX = "img" PREFERRED_PROVIDER_virtual/libg2d_mx6 ?= "imx-gpu-g2d" MACHINE_FIRMWARE_remove = "firmware-imx-epdc" + +# Use i.MX Gstreamer Version +PREFERRED_VERSION_gstreamer1.0 = "1.12.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-base = "1.12.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-good = "1.12.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-bad = "1.12.imx" diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc index c64380e..67bb342 100644 --- a/conf/machine/include/colibri-imx6.inc +++ b/conf/machine/include/colibri-imx6.inc @@ -12,3 +12,9 @@ UBOOT_SUFFIX = "img" PREFERRED_PROVIDER_virtual/libg2d_mx6 ?= "imx-gpu-g2d" MACHINE_FIRMWARE_remove = "firmware-imx-epdc" + +# Use i.MX Gstreamer Version +PREFERRED_VERSION_gstreamer1.0 = "1.12.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-base = "1.12.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-good = "1.12.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-bad = "1.12.imx" diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc index 97edac8..91b4b2f 100644 --- a/conf/machine/include/colibri-imx6ull.inc +++ b/conf/machine/include/colibri-imx6ull.inc @@ -5,3 +5,9 @@ TORADEX_PRODUCT_IDS[0036] = "imx6ull-colibri-eval-v3.dtb" TORADEX_PRODUCT_IDS[0040] = "imx6ull-colibri-wifi-eval-v3.dtb" TORADEX_PRODUCT_IDS[0044] = "imx6ull-colibri-eval-v3.dtb" TORADEX_FLASH_TYPE = "rawnand" + +# Use i.MX Gstreamer Version (for PXP DMA-ENGINE Driver) +PREFERRED_VERSION_gstreamer1.0 = "1.12.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-base = "1.12.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-good = "1.12.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-bad = "1.12.imx" diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc index b54f2cc..1bc14f4 100644 --- a/conf/machine/include/colibri-imx7-emmc.inc +++ b/conf/machine/include/colibri-imx7-emmc.inc @@ -6,3 +6,9 @@ TORADEX_PRODUCT_IDS = "0039" TORADEX_FLASH_TYPE = "emmc" MACHINE_FIRMWARE_remove = "firmware-imx-epdc" + +# Use i.MX Gstreamer Version (for PXP DMA-ENGINE Driver) +PREFERRED_VERSION_gstreamer1.0 = "1.12.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-base = "1.12.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-good = "1.12.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-bad = "1.12.imx" diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc index 7a5f7b0..5937c0e 100644 --- a/conf/machine/include/colibri-imx7.inc +++ b/conf/machine/include/colibri-imx7.inc @@ -7,3 +7,9 @@ TORADEX_PRODUCT_IDS[0041] = "imx7d-colibri-eval-v3.dtb" TORADEX_FLASH_TYPE = "rawnand" MACHINE_FIRMWARE_remove = "firmware-imx-epdc" + +# Use i.MX Gstreamer Version (for PXP DMA-ENGINE Driver) +PREFERRED_VERSION_gstreamer1.0 = "1.12.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-base = "1.12.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-good = "1.12.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-bad = "1.12.imx" -- cgit v1.2.3