From 5d17a30c665dd7c93d2fc6bd1fc3b352f2a074c0 Mon Sep 17 00:00:00 2001
From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Thu, 3 Sep 2020 15:02:24 -0700
Subject: imx-gpu-viv: Upgrade to 6.4.0.p2.4

- Upgrade to weston 8.0
- Upgrade to Qt 5.15 (vulkan experimental)
- Upgrade to OpenCV 4.1
- Support for Android 10, Android NN
- Support for TensorFlow Lite 2.1

Fixed Issues:
- LF-459 [8QM] GPU/xwld:Vulkan sdk demo 'ObjectSelection' flicker on display.
- LF-423 ML/AI:Some dnn_vxc cases showed out-of-range recognition rates.
- LF-844 [6QP_SD] GPU/FB: Bloom_FB cannot be killed by ctrl c randomly.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
(cherry picked from commit b2036a3242a6da9282565b75a5b4deb971b1cbb7)
---
 recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc                 |  2 +-
 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.0-aarch32.bb | 10 ----------
 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.0-aarch64.bb |  6 ------
 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.4-aarch32.bb | 10 ++++++++++
 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.4-aarch64.bb |  6 ++++++
 5 files changed, 17 insertions(+), 17 deletions(-)
 delete mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.0-aarch32.bb
 delete mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.0-aarch64.bb
 create mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.4-aarch32.bb
 create mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.4-aarch64.bb

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 5c25eec6c..cf0f702d6 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -6,7 +6,7 @@
 DESCRIPTION = "GPU driver and apps for i.MX"
 SECTION = "libs"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fd4b227530cd88a82af6a5982cfb724d"
+LIC_FILES_CHKSUM = "file://COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9"
 
 DEPENDS += " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.0-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.0-aarch32.bb
deleted file mode 100644
index d1b82f6e1..000000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.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 recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
-
-SRC_URI[md5sum] = "4544b0c874914dfbc47ec93855bd04a7"
-SRC_URI[sha256sum] = "bae4099119259a303a265eb02d9f0d63348bbf3f8637de6cb892e209171b4c97"
-
-COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx7ulp)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.0-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.0-aarch64.bb
deleted file mode 100644
index b46c6115c..000000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.0-aarch64.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require imx-gpu-viv-6.inc
-
-SRC_URI[md5sum] = "f4005a4a2dba6a79d8f25547612aa3b9"
-SRC_URI[sha256sum] = "148e1b1a9e382a8159d5763dd2b08caad008eb931f3d925ac901c2438440d508"
-
-COMPATIBLE_MACHINE = "(mx8)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.4-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.4-aarch32.bb
new file mode 100644
index 000000000..66e4d90a7
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.4-aarch32.bb
@@ -0,0 +1,10 @@
+# Copyright (C) 2013-2016 Freescale Semiconductor
+# Copyright 2017-2020 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+require recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+
+SRC_URI[md5sum] = "cd5e9ba9247aa0da5d97b0f030e2ede1"
+SRC_URI[sha256sum] = "9cc4c6594083f5970bc394a698a0a8ed0c7f2a1a753dfbf25cb0be5ab8bdcbd5"
+
+COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx7ulp)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.4-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.4-aarch64.bb
new file mode 100644
index 000000000..241752d8b
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.4-aarch64.bb
@@ -0,0 +1,6 @@
+require imx-gpu-viv-6.inc
+
+SRC_URI[md5sum] = "633029434f0ccc0e8a6b01d92cae95b2"
+SRC_URI[sha256sum] = "a295f41a6346c507fc8a677c26ecf9b2f416735e32e6d0734516ef5363027720"
+
+COMPATIBLE_MACHINE = "(mx8)"
-- 
cgit v1.2.3-54-g00ecf