From e18790cc2e2a2bada6c3bdb1ad49f982f15aedb2 Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Fri, 23 Aug 2019 11:45:15 +0200
Subject: [PATCH] imx-gpu-viv: sync with meta-fsl-bsp-release branch
 sumo-4.14.98-2.1.0

Update to v6.2.4.p4.2. Make sure to keep the "wayland" distro feature check
out of the recipe to be able to compile framebuffer images for the ccimx8x.

https://jira.digi.com/browse/DEL-6722

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 .../recipes-graphics/imx-gpu-viv/imx-gpu-viv-v6.inc       | 1 +
 .../imx-gpu-viv/imx-gpu-viv_6.2.4.p4.0-aarch32.bb         | 8 --------
 .../imx-gpu-viv/imx-gpu-viv_6.2.4.p4.0-aarch64.bb         | 8 --------
 .../imx-gpu-viv/imx-gpu-viv_6.2.4.p4.2-aarch32.bb         | 8 ++++++++
 .../imx-gpu-viv/imx-gpu-viv_6.2.4.p4.2-aarch64.bb         | 8 ++++++++
 5 files changed, 17 insertions(+), 16 deletions(-)
 delete mode 100644 meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.0-aarch32.bb
 delete mode 100644 meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.0-aarch64.bb
 create mode 100644 meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.2-aarch32.bb
 create mode 100644 meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.2-aarch64.bb

diff --git a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv-v6.inc b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv-v6.inc
index d7d5a2c02..9b00659b6 100644
--- a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv-v6.inc
+++ b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv-v6.inc
@@ -141,6 +141,7 @@ HAS_GBM_mx8 = "true"
 GLES3_HEADER_REMOVALS = "gl31.h gl32.h"
 GLES3_HEADER_REMOVALS_remove_mx8   = "gl31.h"
 GLES3_HEADER_REMOVALS_remove_mx8qm = "gl32.h"
+GLES3_HEADER_REMOVALS_mx8qxp = ""
 
 do_install () {
     install -d ${D}${libdir}
diff --git a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.0-aarch32.bb b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.0-aarch32.bb
deleted file mode 100644
index 2bf0a2ba5..000000000
--- a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.0-aarch32.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require imx-gpu-viv-v6.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=80c0478f4339af024519b3723023fe28" 
-
-SRC_URI[md5sum] = "83c40f63358dd3bd9bbc1cd7521bf8fe"
-SRC_URI[sha256sum] = "5abfc3b24c1f9d02970064898fb30da705b67bc7e967dbfbf0525c1cc60f2491"
-
-COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx7ulp)"
diff --git a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.0-aarch64.bb b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.0-aarch64.bb
deleted file mode 100644
index 1891dd727..000000000
--- a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.0-aarch64.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require imx-gpu-viv-v6.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=80c0478f4339af024519b3723023fe28" 
-
-SRC_URI[md5sum] = "a937571f6ecf85bdff1dfb3b6c834ed0"
-SRC_URI[sha256sum] = "1eb4ebe2fa11d8fb7beb8fc7046bb57093fd416d0a401608d78cd48b65624fcd"
-
-COMPATIBLE_MACHINE = "(mx8)"
diff --git a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.2-aarch32.bb b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.2-aarch32.bb
new file mode 100644
index 000000000..8761a980f
--- /dev/null
+++ b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.2-aarch32.bb
@@ -0,0 +1,8 @@
+require imx-gpu-viv-v6.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=72c0f70181bb6e83eee6aab8de12a9f3"
+
+SRC_URI[md5sum] = "db096170c024aee88c48dd5b627e54b9"
+SRC_URI[sha256sum] = "aa53c15c34b7af3b05876a0dfe4046ed4b864464d1bc9f10dcc0978e448f12a2"
+
+COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx7ulp)"
diff --git a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.2-aarch64.bb b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.2-aarch64.bb
new file mode 100644
index 000000000..66e2da76f
--- /dev/null
+++ b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.2-aarch64.bb
@@ -0,0 +1,8 @@
+require imx-gpu-viv-v6.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=72c0f70181bb6e83eee6aab8de12a9f3"
+
+SRC_URI[md5sum] = "fd50ff48725e6dd44aab2e08aeb87717"
+SRC_URI[sha256sum] = "a36cea6116f3e04ef0fbaf880965eed71b093a065e25c91b2b494df0f944792b"
+
+COMPATIBLE_MACHINE = "(mx8)"