From 7d0ec57d413804b333b91448c927e2fc8f6e64b1 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sun, 20 Feb 2022 16:08:15 +0100 Subject: layer: rework recipes to use soc familiy overrides Follow meta-freescale commit 30f5ce1d ("Generalize overrides subsystem for NXP and Mainline support"). Signed-off-by: Max Krummenacher --- conf/distro/include/tdx-base.inc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/conf/distro/include/tdx-base.inc b/conf/distro/include/tdx-base.inc index ea5da6a..c8f0b41 100644 --- a/conf/distro/include/tdx-base.inc +++ b/conf/distro/include/tdx-base.inc @@ -87,17 +87,17 @@ PREFERRED_RPROVIDER_u-boot-default-env = "${PREFERRED_PROVIDER_virtual/bootloade PREFERRED_PROVIDER_virtual/dtb ?= "device-tree-overlays" # Use i.MX Gstreamer Version (for PXP DMA-ENGINE Driver) -PREFERRED_VERSION_gstreamer1.0:imx ?= "1.18.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-base:imx ?= "1.18.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-good:imx ?= "1.18.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-bad:imx ?= "1.18.0.imx" - -# the 1.16.imx variants have their COMPATIBLE set so that they don't build -# for use-mainline-bsp -PREFERRED_VERSION_gstreamer1.0:use-mainline-bsp ?= "1.18%" -PREFERRED_VERSION_gstreamer1.0-plugins-base:use-mainline-bsp ?= "1.18%" -PREFERRED_VERSION_gstreamer1.0-plugins-good:use-mainline-bsp ?= "1.18%" -PREFERRED_VERSION_gstreamer1.0-plugins-bad:use-mainline-bsp ?= "1.18%" +PREFERRED_VERSION_gstreamer1.0:imx-nxp-bsp ?= "1.18.0.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-base:imx-nxp-bsp ?= "1.18.0.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-good:imx-nxp-bsp ?= "1.18.0.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-bad:imx-nxp-bsp ?= "1.18.0.imx" + +# If the gstreamer imx variant gets prefered over upstream due to versioning +# set the preferred version for the upstream variant here: +#PREFERRED_VERSION_gstreamer1.0:imx-mainline-bsp ?= "1.18%" +#PREFERRED_VERSION_gstreamer1.0-plugins-base:imx-mainline-bsp ?= "1.18%" +#PREFERRED_VERSION_gstreamer1.0-plugins-good:imx-mainline-bsp ?= "1.18%" +#PREFERRED_VERSION_gstreamer1.0-plugins-bad:imx-mainline-bsp ?= "1.18%" PREFERRED_PROVIDER_opencl-headers:imxgpu = "imx-gpu-viv" PREFERRED_PROVIDER_opencl-clhpp:imxgpu = "imx-gpu-viv" -- cgit v1.2.3