From 7fd17c7fd0f1dd782cf052e67deb11435648aa50 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 18 Apr 2019 11:51:18 +0200 Subject: machines: remove defines now set in our distro Signed-off-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 deletions(-) diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc index 5aaf711..ad004a3 100644 --- a/conf/machine/include/apalis-imx6.inc +++ b/conf/machine/include/apalis-imx6.inc @@ -17,9 +17,3 @@ MACHINE_FIRMWARE_remove = "firmware-imx-epdc" # As per meta-freescale commit 927b31771dab ("xf86-video-imx-vivante: Remove fb # from name") this package got renamed. Use new one! XSERVER_DRIVER_apalis-imx6 = "xf86-video-imx-vivante" - -# Use i.MX Gstreamer Version -PREFERRED_VERSION_gstreamer1.0 = "1.14.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-base = "1.14.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-good = "1.14.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-bad = "1.14.imx" diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc index 8ceabb9..7340c49 100644 --- a/conf/machine/include/colibri-imx6.inc +++ b/conf/machine/include/colibri-imx6.inc @@ -16,9 +16,3 @@ MACHINE_FIRMWARE_remove = "firmware-imx-epdc" # As per meta-freescale commit 927b31771dab ("xf86-video-imx-vivante: Remove fb # from name") this package got renamed. Use new one! XSERVER_DRIVER_colibri-imx6 = "xf86-video-imx-vivante" - -# Use i.MX Gstreamer Version -PREFERRED_VERSION_gstreamer1.0 = "1.14.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-base = "1.14.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-good = "1.14.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-bad = "1.14.imx" diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc index 9031c33..2af982a 100644 --- a/conf/machine/include/colibri-imx6ull.inc +++ b/conf/machine/include/colibri-imx6ull.inc @@ -6,9 +6,3 @@ TORADEX_PRODUCT_IDS[0040] = "imx6ull-colibri-wifi-eval-v3.dtb" TORADEX_PRODUCT_IDS[0044] = "imx6ull-colibri-eval-v3.dtb" TORADEX_PRODUCT_IDS[0045] = "imx6ull-colibri-wifi-eval-v3.dtb" TORADEX_FLASH_TYPE = "rawnand" - -# Use i.MX Gstreamer Version (for PXP DMA-ENGINE Driver) -PREFERRED_VERSION_gstreamer1.0 = "1.14.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-base = "1.14.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-good = "1.14.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-bad = "1.14.imx" diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc index e607018..3297d9b 100644 --- a/conf/machine/include/colibri-imx7-emmc.inc +++ b/conf/machine/include/colibri-imx7-emmc.inc @@ -6,9 +6,3 @@ 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.14.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-base = "1.14.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-good = "1.14.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-bad = "1.14.imx" diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc index 29a1fa9..487b91c 100644 --- a/conf/machine/include/colibri-imx7.inc +++ b/conf/machine/include/colibri-imx7.inc @@ -7,9 +7,3 @@ 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.14.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-base = "1.14.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-good = "1.14.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-bad = "1.14.imx" -- cgit v1.2.3