From 1618d5acd8f709f49d1056675adcd3517627347a Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 28 Jan 2021 13:56:39 +0100 Subject: distro: tdx-base.inc: preferred_versions: follow updates NXP release imx_5.4.70_2.3.0. Related-to: ELB-3327 Signed-off-by: Max Krummenacher (cherry picked from commit 2561e4a6cc6d5a8f6badb32ed3ead6eb4b536519) --- conf/distro/include/tdx-base.inc | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/conf/distro/include/tdx-base.inc b/conf/distro/include/tdx-base.inc index 80116ca..aeb18fd 100644 --- a/conf/distro/include/tdx-base.inc +++ b/conf/distro/include/tdx-base.inc @@ -75,7 +75,7 @@ PREFERRED_VERSION_gstreamer1.0-plugins-base_imx = "1.16.imx" PREFERRED_VERSION_gstreamer1.0-plugins-good_imx = "1.16.imx" PREFERRED_VERSION_gstreamer1.0-plugins-bad_imx = "1.16.imx" -# these 1.16.imx variants have their COMPATIBLE set so that they don't build +# 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.16%" PREFERRED_VERSION_gstreamer1.0-plugins-base_use-mainline-bsp = "1.16%" @@ -83,9 +83,20 @@ PREFERRED_VERSION_gstreamer1.0-plugins-good_use-mainline-bsp = "1.16%" PREFERRED_VERSION_gstreamer1.0-plugins-bad_use-mainline-bsp = "1.16%" # Override Wayland/Weston Version set in meta-freescale imx-base.inc -PREFERRED_VERSION_wayland-protocols_mx6 = "1.18.imx" -PREFERRED_VERSION_wayland-protocols_mx7 = "1.18.imx" -PREFERRED_VERSION_wayland-protocols_mx8 = "1.18.imx" -PREFERRED_VERSION_weston_mx6 = "8.0.0.imx" -PREFERRED_VERSION_weston_mx7 = "8.0.0.imx" -PREFERRED_VERSION_weston_mx8 = "8.0.0.imx" +PREFERRED_VERSION_wayland-protocols_mx6 = "1.20.imx" +PREFERRED_VERSION_wayland-protocols_mx7 = "1.20.imx" +PREFERRED_VERSION_wayland-protocols_mx8 = "1.20.imx" + +PREFERRED_VERSION_weston_mx6 ?= "9.0.0.imx" +PREFERRED_VERSION_weston_mx7 ?= "9.0.0.imx" +PREFERRED_VERSION_weston_mx8 ?= "9.0.0.imx" + +# Use i.MX libdrm Version +PREFERRED_VERSION_libdrm_mx6 = "2.4.102.imx" +PREFERRED_VERSION_libdrm_mx7 = "2.4.102.imx" +PREFERRED_VERSION_libdrm_mx8 = "2.4.102.imx" + +PREFERRED_PROVIDER_opencl-headers_imxgpu = "imx-gpu-viv" +PREFERRED_PROVIDER_opencl-clhpp_imxgpu = "imx-gpu-viv" +PREFERRED_PROVIDER_opencl-icd-loader_imxgpu = "imx-gpu-viv" +PREFERRED_RPROVIDER_opencl-icd-loader_imxgpu = "libopencl-imx" -- cgit v1.2.3