5 files changed, 147 insertions, 107 deletions

diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
index 3b05b2abd..e7d0188db 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -3,18 +3,19 @@
 # Copyright 2017-2024 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 
+SUMMARY = "i.MX Vivante GPU driver"
 DESCRIPTION = "GPU driver and apps for i.MX"
 HOMEPAGE = "https://www.nxp.com/"
 SECTION = "libs"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ea25d099982d035af85d193c88a1b479"
+LICENSE = "LicenseRef-Proprietary"
+LIC_FILES_CHKSUM ?= "file://COPYING;md5=ea25d099982d035af85d193c88a1b479"
 
-DEPENDS += " \
+DEPENDS += "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \
        bb.utils.contains('DISTRO_FEATURES',     'x11', 'virtual/libx11 libxdamage libxext libxfixes', \
                                                        '', d), d)} \
 "
-DEPENDS += " \
+DEPENDS += "\
     ${@bb.utils.contains('DISTRO_FEATURES',     'x11', 'libxcb libxshmfence libxxf86vm', \
                                                        '', d)} \
 "
@@ -23,14 +24,14 @@ DEPENDS:append:mx8-nxp-bsp = " patchelf-native"
 
 DEPENDS:append:libc-musl = " gcompat"
 
-PROVIDES += " \
+PROVIDES += "\
     imx-gpu-viv \
     libgal-imx \
     virtual/egl \
     virtual/libopenvg \
     ${EXTRA_PROVIDES} \
 "
-EXTRA_PROVIDES = " \
+EXTRA_PROVIDES = "\
     ${PROVIDES_OPENCL} \
     ${PROVIDES_OPENVX} \
 "
@@ -43,21 +44,21 @@ EXTRA_PROVIDES:append:mx8-nxp-bsp = " \
     virtual/libgbm \
 "
 
-PROVIDES_OPENCL = " \
+PROVIDES_OPENCL = "\
     opencl-headers \
     opencl-clhpp \
     opencl-icd-loader \
     virtual/libopencl1 \
 "
-PROVIDES_OPENCL:mx7-nxp-bsp   = ""
+PROVIDES_OPENCL:mx7-nxp-bsp = ""
 PROVIDES_OPENCL:mx8mm-nxp-bsp = ""
 
 # Note: OpenVX is fully supported on i.MX 8 QuadMax and 8 QuadPlus.
 # However, only limited support is provided on other i.MX 8 machines
 # as needed for i.MX machine learning packages.
-PROVIDES_OPENVX                  = ""
-PROVIDES_OPENVX:mx8-nxp-bsp      = "virtual/libopenvx"
-PROVIDES_OPENVX:mx8mm-nxp-bsp    = ""
+PROVIDES_OPENVX = ""
+PROVIDES_OPENVX:mx8-nxp-bsp = "virtual/libopenvx"
+PROVIDES_OPENVX:mx8mm-nxp-bsp = ""
 
 RPROVIDES:${PN}:imxgpu3d += "imx-gpu-viv"
 
@@ -65,7 +66,6 @@ PE = "1"
 
 inherit fsl-eula-unpack
 
-FILESEXTRAPATHS:append := "${THISDIR}/imx-gpu-viv:"
 SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
 
 S = "${UNPACKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
@@ -76,41 +76,47 @@ PACKAGECONFIG ?= ""
 PACKAGECONFIG[valgrind] = ""
 
 # Note : If you add a package here, to prevent a naming conflict see the python_anonymous() futher below
-PACKAGES =+ " \
-        libgles1-imx libgles1-imx-dev \
-        libgles2-imx libgles2-imx-dev \
-        libgles3-imx-dev \
-        libglslc-imx libglslc-imx-dev \
-        ${PACKAGES_OPENCL} \
-        libopenvg-imx libopenvg-imx-dev \
-        libvdk-imx libvdk-imx-dev \
-        libegl-imx libegl-imx-dev \
-        libgal-imx libgal-imx-dev \
-        libvsc-imx \
-        ${PACKAGES_GBM} \
-        imx-gpu-viv-tools \
-        imx-gpu-viv-demos \
-        ${PACKAGES_VULKAN} \
-        ${PACKAGES_OPENVX} \
-        libnn-imx \
-        libspirv-imx \
+PACKAGES =+ "\
+    libgles1-imx libgles1-imx-dev \
+    libgles2-imx libgles2-imx-dev \
+    libgles3-imx-dev \
+    libglslc-imx libglslc-imx-dev \
+    ${PACKAGES_OPENCL} \
+    libopenvg-imx libopenvg-imx-dev \
+    libvdk-imx libvdk-imx-dev \
+    libegl-imx libegl-imx-dev \
+    libgal-imx libgal-imx-dev \
+    libvsc-imx \
+    ${PACKAGES_GBM} \
+    imx-gpu-viv-tools \
+    imx-gpu-viv-demos \
+    ${PACKAGES_VULKAN} \
+    ${PACKAGES_OPENVX} \
+    libnn-imx \
+    libspirv-imx \
 "
 
-PACKAGES_GBM                  = ""
-PACKAGES_GBM:mx8-nxp-bsp      = "libgbm-imx libgbm-imx-dev"
+PACKAGES_GBM = ""
+PACKAGES_GBM:mx8-nxp-bsp = "libgbm-imx libgbm-imx-dev"
 
-PACKAGES_OPENCL               = "libclc-imx libopencl-imx libopencl-imx-dev"
-PACKAGES_OPENCL:mx7-nxp-bsp   = ""
+PACKAGES_OPENCL = "libclc-imx libopencl-imx libopencl-imx-dev"
+PACKAGES_OPENCL:mx7-nxp-bsp = ""
 PACKAGES_OPENCL:mx8mm-nxp-bsp = ""
 
-PACKAGES_OPENVX = \
-    "${@bb.utils.contains("PROVIDES_OPENVX", "virtual/libopenvx", \
-        "libopenvx-imx libopenvx-imx-dev", "", d)}"
+PACKAGES_OPENVX = "${@bb.utils.contains("PROVIDES_OPENVX", "virtual/libopenvx", \
+                      "libopenvx-imx libopenvx-imx-dev", "", d)}"
 
-PACKAGES_VULKAN               = ""
-PACKAGES_VULKAN:imxvulkan     = "libvulkan-imx libvulkan-imx-dev"
+PACKAGES_VULKAN = ""
+PACKAGES_VULKAN:imxvulkan = "libvulkan-imx libvulkan-imx-dev"
 PACKAGES_VULKAN:mx8mm-nxp-bsp = "libvulkan-imx libvulkan-imx-dev"
 
+# libgbm-imx, libvulkan-imx and libopenvx-imx (and their -dev variants) enter
+# PACKAGES only through the machine-conditional PACKAGES_GBM/_VULKAN and the
+# PROVIDES_OPENVX-gated PACKAGES_OPENVX above. Declare them as potentially
+# present so their FILES/RDEPENDS/RPROVIDES/INSANE_SKIP assignments are
+# recognised even when the current parse does not activate those conditions.
+PACKAGES_DYNAMIC += "^libgbm-imx ^libvulkan-imx ^libopenvx-imx"
+
 python __anonymous () {
         has_vivante_kernel_driver_support = (d.getVar('MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT') or '0')
         if has_vivante_kernel_driver_support != '1':
@@ -166,16 +172,16 @@ IS_MX8:mx8-nxp-bsp = "1"
 
 PACKAGE_FP_TYPE = "hardfp"
 
-HAS_GBM     = "false"
+HAS_GBM = "false"
 HAS_GBM:mx8-nxp-bsp = "true"
 
-IMX_SOC        = "IMX_SOC_NOT_SET"
-IMX_SOC:mx8qm-nxp-bsp  = "mx8qm"
+IMX_SOC = "IMX_SOC_NOT_SET"
+IMX_SOC:mx8qm-nxp-bsp = "mx8qm"
 IMX_SOC:mx8qxp-nxp-bsp = "mx8qxp"
-IMX_SOC:mx8dx-nxp-bsp  = "mx8qxp"
-IMX_SOC:mx8mp-nxp-bsp  = "mx8mp"
-IMX_SOC:mx8mq-nxp-bsp  = "mx8mq"
-IMX_SOC:mx8mn-nxp-bsp  = "mx8mn"
+IMX_SOC:mx8dx-nxp-bsp = "mx8qxp"
+IMX_SOC:mx8mp-nxp-bsp = "mx8mp"
+IMX_SOC:mx8mq-nxp-bsp = "mx8mq"
+IMX_SOC:mx8mn-nxp-bsp = "mx8mn"
 IMX_SOC:mx8ulp-nxp-bsp = "mx8ulp"
 
 do_install () {
@@ -183,17 +189,17 @@ do_install () {
     install -d ${D}${includedir}
     install -d ${D}${bindir}
 
-    cp -P ${S}/gpu-core/usr/lib/*.so* ${D}${libdir}
-    cp -r ${S}/gpu-core/usr/include/* ${D}${includedir}
-    cp -r ${S}/gpu-demos/opt ${D}
-    cp -r ${S}/gpu-tools/gmem-info/usr/bin/* ${D}${bindir}
+    cp --no-preserve=ownership -P ${S}/gpu-core/usr/lib/*.so* ${D}${libdir}
+    cp --no-preserve=ownership -r ${S}/gpu-core/usr/include/* ${D}${includedir}
+    cp --no-preserve=ownership -r ${S}/gpu-demos/opt ${D}
+    cp --no-preserve=ownership -r ${S}/gpu-tools/gmem-info/usr/bin/* ${D}${bindir}
 
     # Use vulkan header from vulkan-headers recipe to support vkmark
     rm -rf ${D}${includedir}/vulkan/
 
     # Install SOC-specific drivers
     if [ -d ${S}/gpu-core/usr/lib/${IMX_SOC} ]; then
-        cp -r ${S}/gpu-core/usr/lib/${IMX_SOC}/* ${D}${libdir}
+        cp --no-preserve=ownership -r ${S}/gpu-core/usr/lib/${IMX_SOC}/* ${D}${libdir}
     fi
 
     install -d ${D}${libdir}/pkgconfig
@@ -212,15 +218,15 @@ do_install () {
             install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/gl.pc ${D}${libdir}/pkgconfig/gl.pc
         fi
         install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_wayland.pc ${D}${libdir}/pkgconfig/egl.pc
-        cp -r ${S}/gpu-core/usr/lib/wayland/* ${D}${libdir}
+        cp --no-preserve=ownership -r ${S}/gpu-core/usr/lib/wayland/* ${D}${libdir}
     elif [ "${IS_MX8}" != "1" ]; then
         # Framebuffer backend for i.MX 6 and 7
         install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_linuxfb.pc ${D}${libdir}/pkgconfig/egl.pc
-        cp -r ${S}/gpu-core/usr/lib/fb/* ${D}${libdir}
+        cp --no-preserve=ownership -r ${S}/gpu-core/usr/lib/fb/* ${D}${libdir}
     else
         # Framebuffer backend for i.MX 8 and beyond
         install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl.pc         ${D}${libdir}/pkgconfig/egl.pc
-        cp -r ${S}/gpu-core/usr/lib/wayland/* ${D}${libdir}
+        cp --no-preserve=ownership -r ${S}/gpu-core/usr/lib/wayland/* ${D}${libdir}
         set -f
         for f in ${FILES:libvdk-imx} ${FILES:libvdk-imx-dev}; do
             set +f
@@ -233,7 +239,7 @@ do_install () {
     fi
     if [ "${BACKEND}" = "wayland" ] && [ "${IS_MX8}" != "1" ]; then
         # Special case for libVDK on Wayland backend, deliver fb library as well.
-        cp ${S}/gpu-core/usr/lib/fb/libVDK.so.1.2.0 ${D}${libdir}/libVDK-fb.so.1.2.0
+        install -m 0644 ${S}/gpu-core/usr/lib/fb/libVDK.so.1.2.0 ${D}${libdir}/libVDK-fb.so.1.2.0
     fi
 
     if [ -z "${PACKAGES_OPENCL}" ]; then
@@ -317,96 +323,112 @@ do_install:append:libc-musl() {
 
 ALLOW_EMPTY:${PN} = "1"
 
-FILES:libclc-imx = "${libdir}/libCLC${SOLIBS}"
+FILES:libclc-imx += "${libdir}/libCLC${SOLIBS}"
 
-FILES:libegl-imx = "${libdir}/libEGL${REALSOLIBS} ${libdir}/libEGL${SOLIBS} "
-FILES:libegl-imx-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
+FILES:libegl-imx += "${libdir}/libEGL${REALSOLIBS} ${libdir}/libEGL${SOLIBS} "
+FILES:libegl-imx-dev += "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
 # libEGL.so is used by some demo apps from Freescale
+# nooelint: oelint.vars.insaneskip
 INSANE_SKIP:libegl-imx += "dev-so"
 
-FILES:libgal-imx = "${libdir}/libGAL${SOLIBS} ${libdir}/libGAL_egl${SOLIBS}"
+FILES:libgal-imx += "${libdir}/libGAL${SOLIBS} ${libdir}/libGAL_egl${SOLIBS}"
 RDEPENDS:libgal-imx += "${@bb.utils.contains('PACKAGECONFIG', 'valgrind', 'valgrind', '', d)}"
 RPROVIDES:libgal-imx += "libgal-imx"
 RRECOMMENDS:libgal-imx += "kernel-module-imx-gpu-viv"
+# Prebuilt Vivante blob: its build-time dependencies are not expressed as recipe
+# DEPENDS, so the build-deps QA check cannot be satisfied here.
+# nooelint: oelint.vars.insaneskip
 INSANE_SKIP:libgal-imx += "build-deps"
 
-FILES:libvsc-imx = "${libdir}/libVSC${SOLIBS}"
+FILES:libvsc-imx += "${libdir}/libVSC${SOLIBS}"
 
-FILES:libgbm-imx           = "${libdir}/libgbm*${REALSOLIBS} ${libdir}/libgbm${SOLIBS} ${libdir}/libgbm_viv${SOLIBS}"
-FILES:libgbm-imx-dev       = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h"
+FILES:libgbm-imx += "${libdir}/libgbm*${REALSOLIBS} ${libdir}/libgbm${SOLIBS} ${libdir}/libgbm_viv${SOLIBS}"
+FILES:libgbm-imx-dev += "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h"
 RDEPENDS:libgbm-imx:append = " libdrm"
+# libgbm ships its unversioned .so in the runtime package for dlopen consumers.
+# nooelint: oelint.vars.insaneskip
 INSANE_SKIP:libgbm-imx += "dev-so"
 
-FILES:libvulkan-imx = "\
+FILES:libvulkan-imx += "\
     ${libdir}/libvulkan_VSI${REALSOLIBS} \
-    ${sysconfdir}/vulkan"
-FILES:libvulkan-imx-dev = "${includedir}/vulkan ${libdir}/libvulkan_VSI${SOLIBSDEV}"
+    ${datadir}/vulkan"
+FILES:libvulkan-imx-dev += "${includedir}/vulkan ${libdir}/libvulkan_VSI${SOLIBSDEV}"
 RPROVIDES:libvulkan-imx = "virtual-vulkan-icd"
 
-FILES:libspirv-imx = " \
+FILES:libspirv-imx += "\
     ${libdir}/libSPIRV_viv${SOLIBS} \
 "
 
-FILES:libopenvx-imx = " \
+FILES:libopenvx-imx += "\
     ${libdir}/libOpenVX${REALSOLIBS} \
     ${libdir}/libOpenVXC${SOLIBS} \
     ${libdir}/libOpenVXU${SOLIBS} \
     ${libdir}/libOvx*${SOLIBS} \
     ${libdir}/libArchModelSw${SOLIBS} \
 "
-FILES:libopenvx-imx-dev = "${includedir}/VX ${libdir}/libOpenVX${SOLIBSDEV}"
+FILES:libopenvx-imx-dev += "${includedir}/VX ${libdir}/libOpenVX${SOLIBSDEV}"
 RDEPENDS:libopenvx-imx = "${OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES}"
-OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES               = ""
+OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES = ""
 OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES:mx8qm-nxp-bsp = "libclc-imx libopencl-imx-dev"
 OPENCL_VX_INTRINSIC_EXTENSION_PACKAGES:mx8mp-nxp-bsp = "libclc-imx libopencl-imx-dev"
+# The runtime package pulls -dev packages (OpenCL/VX intrinsic extensions) by
+# design; the dev-deps QA check does not fit this prebuilt driver layout.
+# nooelint: oelint.vars.insaneskip
 INSANE_SKIP:libopenvx-imx += "dev-deps"
 
-FILES:libgles1-imx = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${REALSOLIBS} ${libdir}/libGLES_*${SOLIBS}"
-FILES:libgles1-imx-dev = "${includedir}/GLES ${libdir}/pkgconfig/glesv1_cm.pc"
+FILES:libgles1-imx += "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${REALSOLIBS} ${libdir}/libGLES_*${SOLIBS}"
+FILES:libgles1-imx-dev += "${includedir}/GLES ${libdir}/pkgconfig/glesv1_cm.pc"
 RPROVIDES:libgles1-imx = "libgles-imx"
 RPROVIDES:libgles1-imx-dev = "libgles-imx-dev"
 # libEGL does dlopen of libGLESv1.so
+# nooelint: oelint.vars.insaneskip
 INSANE_SKIP:libgles1-imx += "dev-so"
 
-FILES:libgles2-imx = "${libdir}/libGLESv2${REALSOLIBS} ${libdir}/libGLESv2${SOLIBS}"
-FILES:libgles2-imx-dev = "${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc"
+FILES:libgles2-imx += "${libdir}/libGLESv2${REALSOLIBS} ${libdir}/libGLESv2${SOLIBS}"
+FILES:libgles2-imx-dev += "${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc"
 RDEPENDS:libgles2-imx = "libglslc-imx"
 # libEGL does dlopen of libGLESv2.so
+# nooelint: oelint.vars.insaneskip
 INSANE_SKIP:libgles2-imx += "dev-so"
 
-FILES:libgles3-imx-dev = "${includedir}/GLES3"
+FILES:libgles3-imx-dev += "${includedir}/GLES3"
 # as long as there is no libgles3: ship libgles3-dev along with
 # libgles2-dev - otherwise GLES3 headers have to be added manually
 RDEPENDS:libgles2-imx-dev += "libgles3-imx-dev"
 
-FILES:libglslc-imx = "${libdir}/libGLSLC${SOLIBS}"
+FILES:libglslc-imx += "${libdir}/libGLSLC${SOLIBS}"
 
-FILES:libopencl-imx = "${libdir}/libOpenCL${REALSOLIBS} \
-                       ${libdir}/libVivanteOpenCL${SOLIBS} \
-                       ${libdir}/libLLVM_viv${SOLIBS} \
-                       ${sysconfdir}/OpenCL/vendors/Vivante.icd"
-FILES:libopencl-imx-dev = "${includedir}/CL ${libdir}/libOpenCL${SOLIBSDEV}"
+FILES:libopencl-imx += "${libdir}/libOpenCL${REALSOLIBS} \
+                        ${libdir}/libVivanteOpenCL${SOLIBS} \
+                        ${libdir}/libLLVM_viv${SOLIBS} \
+                        ${sysconfdir}/OpenCL/vendors/Vivante.icd"
+FILES:libopencl-imx-dev += "${includedir}/CL ${libdir}/libOpenCL${SOLIBSDEV}"
 RDEPENDS:libopencl-imx = "libclc-imx"
-RPROVIDES:libopencl-imx               = "virtual-opencl-icd"
-RPROVIDES:libopencl-imx:mx7-nxp-bsp   = ""
+RPROVIDES:libopencl-imx = "virtual-opencl-icd"
+RPROVIDES:libopencl-imx:mx7-nxp-bsp = ""
 RPROVIDES:libopencl-imx:mx8mm-nxp-bsp = ""
 
-FILES:libopenvg-imx = "${libdir}/libOpenVG*${REALSOLIBS} ${libdir}/libOpenVG*${SOLIBS}"
-FILES:libopenvg-imx-dev = "${includedir}/VG ${libdir}/pkgconfig/vg.pc"
+FILES:libopenvg-imx += "${libdir}/libOpenVG*${REALSOLIBS} ${libdir}/libOpenVG*${SOLIBS}"
+FILES:libopenvg-imx-dev += "${includedir}/VG ${libdir}/pkgconfig/vg.pc"
 # libEGL does dlopen of libOpenVG.so
+# nooelint: oelint.vars.insaneskip
 INSANE_SKIP:libopenvg-imx += "dev-so"
 
-FILES:libvdk-imx = "${libdir}/libVDK*${REALSOLIBS}"
-FILES:libvdk-imx-dev = "${includedir}/*vdk*.h ${libdir}/libVDK${SOLIBSDEV}"
+FILES:libvdk-imx += "${libdir}/libVDK*${REALSOLIBS}"
+FILES:libvdk-imx-dev += "${includedir}/*vdk*.h ${libdir}/libVDK${SOLIBSDEV}"
 
-FILES:imx-gpu-viv-tools = "${bindir}/gmem_info"
+FILES:imx-gpu-viv-tools += "${bindir}/gmem_info"
 
-FILES:imx-gpu-viv-demos = "/opt"
+FILES:imx-gpu-viv-demos += "/opt"
+# Prebuilt demo binaries under /opt carry vendor rpaths and link the -dev
+# packages; the rpaths and dev-deps QA checks do not apply to them.
+# nooelint: oelint.vars.insaneskip
 INSANE_SKIP:imx-gpu-viv-demos += "rpaths dev-deps"
 
-FILES:libnn-imx = "${libdir}/libNN*${SOLIBS}"
+FILES:libnn-imx += "${libdir}/libNN*${SOLIBS}"
 
 # It will use gcompat at runtime therefore checking for these at compile time wont be useful as
 # they dont match musl/gcompat but it should run fine
+# nooelint: oelint.vars.insaneskip
 INSANE_SKIP:append:libc-musl = " file-rdeps"
 
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p3.2-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p3.2-aarch32.bb
deleted file mode 100644
index f0e7d285d..000000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p3.2-aarch32.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require imx-gpu-viv-6.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
-
-IMX_SRCREV_ABBREV = "3c5e429"
-
-SRC_URI[sha256sum] = "ea7ffb01fd7cd88f2a308e5b12b40cc3c9553b8ff2941c4867943b4fee265d27"
-
-COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p3.2-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p3.2-aarch64.bb
deleted file mode 100644
index 38870add7..000000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p3.2-aarch64.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require imx-gpu-viv-6.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
-
-IMX_SRCREV_ABBREV = "3c5e429"
-
-SRC_URI[sha256sum] = "bf6fe102e8aa7a16373392efcf6ac45d705bbb95f5c39501da8aaa30957c554f"
-
-COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p4.4-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p4.4-aarch32.bb
new file mode 100644
index 000000000..86a7c20a3
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p4.4-aarch32.bb
@@ -0,0 +1,9 @@
+require imx-gpu-viv-6.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
+
+IMX_SRCREV_ABBREV = "8626797"
+
+SRC_URI[sha256sum] = "db361e1f9db45f498fd669e1f58823d937d436e6fc797da6c710cf35609b47a9"
+
+COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p4.4-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p4.4-aarch64.bb
new file mode 100644
index 000000000..37db9098a
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p4.4-aarch64.bb
@@ -0,0 +1,27 @@
+require imx-gpu-viv-6.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
+
+IMX_SRCREV_ABBREV = "8626797"
+
+SRC_URI[sha256sum] = "8cc97005a7469c0e83139cf1b9a8106fa6f0a84fb6f87d0f6bb9808408305c28"
+
+do_install:prepend() {
+    if [ "${IS_MX8}" = "1" ]; then
+        if [ ! -z "${PACKAGES_VULKAN}" ]; then
+            mkdir -p ${S}/gpu-core/etc/vulkan/icd.d
+            mv ${S}/gpu-core/usr/share/vulkan/icd.d/verisilicon_icd.json ${S}/gpu-core/etc/vulkan/icd.d/imx_icd.json
+        fi
+    fi
+}
+
+do_install:append() {
+    if [ "${IS_MX8}" = "1" ]; then
+        if [ ! -z "${PACKAGES_VULKAN}" ]; then
+            install -d ${D}${datadir}/vulkan/icd.d
+            mv ${D}${sysconfdir}/vulkan/icd.d/imx_icd.json ${D}${datadir}/vulkan/icd.d/verisilicon_icd.json
+        fi
+    fi
+}
+
+COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"