imx-base: upgrade to release 5.4.70_2.3.0

Update PREFERRED to release 5.4.70_2.3.0.

imx-gpu-viv now has opencl-clhpp in PROVIDES. Set this as the
preferred provider.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
(cherry picked from commit 6ce8be8b047fdda706dfa40ee6191f723b334b65)

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 52e9ac9fb6fb62db8d9e38baeebc5345cf8ef199..718efd108266cfd0092c6469376fcd6f940dd19e 100644 (file)
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -199,10 +199,12 @@ MACHINE_SOCARCH_FILTER_append_use-mainline-bsp = " \
 "
 MACHINE_SOCARCH_FILTER_append_mx6q = " \
     opencl-icd-loader \
+    opencl-clhpp \
     opencl-headers \
 "
 MACHINE_SOCARCH_FILTER_append_mx8 = " \
     opencl-icd-loader \
+    opencl-clhpp \
     opencl-headers \
 "
 MACHINE_SOCARCH_FILTER_append_mx8qm = " \
@@ -302,20 +304,21 @@ PREFERRED_PROVIDER_virtual/libgles1_imxgpu3d ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_virtual/libgles2_imxgpu3d ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_virtual/libg2d            ?= "imx-gpu-g2d"
 PREFERRED_PROVIDER_virtual/libg2d_imxdpu     ?= "imx-dpu-g2d"
+PREFERRED_PROVIDER_opencl-clhpp_imxgpu       ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_opencl-headers_imxgpu     ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_opencl-icd-loader_imxgpu  ?= "imx-gpu-viv"
 
-PREFERRED_VERSION_weston_imx ?= "8.0.0.imx"
+PREFERRED_VERSION_weston_imx ?= "9.0.0.imx"
 PREFERRED_VERSION_weston_use-mainline-bsp = ""
 
-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_wayland-protocols_mx6 ?= "1.20.imx"
+PREFERRED_VERSION_wayland-protocols_mx7 ?= "1.20.imx"
+PREFERRED_VERSION_wayland-protocols_mx8 ?= "1.20.imx"
 
 # Use i.MX libdrm Version
-PREFERRED_VERSION_libdrm_mx6 ?= "2.4.99.imx"
-PREFERRED_VERSION_libdrm_mx7 ?= "2.4.99.imx"
-PREFERRED_VERSION_libdrm_mx8 ?= "2.4.99.imx"
+PREFERRED_VERSION_libdrm_mx6 ?= "2.4.102.imx"
+PREFERRED_VERSION_libdrm_mx7 ?= "2.4.102.imx"
+PREFERRED_VERSION_libdrm_mx8 ?= "2.4.102.imx"
 
 # Use i.MX optee Version
 PREFERRED_VERSION_optee-os_mx8     ?= "3.7.0.imx"