5 files changed, 24 insertions, 21 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 affdf1c6..59d1716f 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -74,9 +74,11 @@ PE = "1"
 
 inherit fsl-eula-unpack
 
-SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true \
-           file://imx_icd.json"
 FILESEXTRAPATHS:append := "${THISDIR}/imx-gpu-viv:"
+SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true \
+           file://imx_icd.json"
+
+S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
 
 PACKAGECONFIG ?= ""
 
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p1.0-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p1.0-aarch32.bb
deleted file mode 100644
index 846fa31d..00000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p1.0-aarch32.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (C) 2013-2016 Freescale Semiconductor
-# Copyright 2017-2020 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-require imx-gpu-viv-6.inc
-
-SRC_URI[md5sum] = "9a1796264d9a07205e3ec7bc184599c8"
-SRC_URI[sha256sum] = "6e2f3fb43d16c30fd0b23027f5205818e9d4c74d4903f1c63f265ccf8269f01d"
-
-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.p1.0-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p1.0-aarch64.bb
deleted file mode 100644
index c1cde9f3..00000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p1.0-aarch64.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require imx-gpu-viv-6.inc
-
-SRC_URI[md5sum] = "f7b41c4f8bfa25959796d240ca0bb285"
-SRC_URI[sha256sum] = "4a5f2235500dc4bdfaaeaffa0e4c13cdd28436cc0d859e5be222bce990fda461"
-
-INSANE_SKIP:append:libc-musl = " file-rdeps"
-RDEPENDS:${PN}:append:libc-musl = " gcompat"
-
-COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p1.2-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p1.2-aarch32.bb
new file mode 100644
index 00000000..07834a3b
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p1.2-aarch32.bb
@@ -0,0 +1,10 @@
+require imx-gpu-viv-6.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=63a38e9f392d8813d6f1f4d0d6fbe657"
+
+IMX_SRCREV_ABBREV = "1e0c396"
+
+SRC_URI[md5sum] = "ac711ff819a31602021b7700b41c1ecc"
+SRC_URI[sha256sum] = "491ac012d691e27856769296e2334ad1b6f45e31ffe7313fcdb028c75b3b69ae"
+
+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.p1.2-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p1.2-aarch64.bb
new file mode 100644
index 00000000..6201ee38
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p1.2-aarch64.bb
@@ -0,0 +1,10 @@
+require imx-gpu-viv-6.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=63a38e9f392d8813d6f1f4d0d6fbe657"
+
+IMX_SRCREV_ABBREV = "1e0c396"
+
+SRC_URI[md5sum] = "34b1a4de2fc9fba8b15fc1f204096603"
+SRC_URI[sha256sum] = "d5904cbbe33a3c1160e9cd15c44d78df25d0dbd7b251add796673af53d3046f6"
+
+COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"