From 2d0da1cc5566cbc1319b9680f23bbd2f299fe420 Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Fri, 27 Oct 2017 10:17:50 +0200
Subject: [PATCH] imx-gpu-g2d: move imx-gpu-g2d out of imx-gpu-viv v6

This commit re-adds the imx-gpu-g2d recipe that was removed
from the imx-gpu-viv v6 driver.

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

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 meta-digi-arm/conf/machine/ccimx6qpsbc.conf   |  2 ++
 .../imx-gpu-g2d/imx-gpu-g2d_6.2.2.p0.bb       | 36 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 meta-digi-dey/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.2.p0.bb

diff --git a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf
index 6d729fe22..810d92b89 100644
--- a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf
+++ b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf
@@ -17,6 +17,8 @@ MACHINE_EXTRA_RRECOMMENDS += "cryptoauthlib"
 MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6564-bt', '', d)}"
 MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6564-wifi', '', d)}"
 
+PREFERRED_PROVIDER_virtual/libg2d_mx6 = "imx-gpu-g2d"
+
 # U-Boot configurations
 # Last one is the default (the one the symlinks point at)
 UBOOT_CONFIG ??= "ccimx6qpsbc2GB"
diff --git a/meta-digi-dey/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.2.p0.bb b/meta-digi-dey/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.2.p0.bb
new file mode 100644
index 000000000..8be05f93f
--- /dev/null
+++ b/meta-digi-dey/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.2.p0.bb
@@ -0,0 +1,36 @@
+# Copyright (C) 2016 Freescale Semiconductor
+# Copyright 2017 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+DESCRIPTION = "GPU G2D library and apps for imx6"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=08fd295cce89b0a9c74b9b83ed74f671"
+
+PROVIDES += "virtual/libg2d"
+
+SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
+
+S="${WORKDIR}/${PN}-${PV}"
+
+inherit fsl-eula-unpack
+
+SRC_URI[md5sum] = "64720dda9b96fd7af5be7e2c654ab72a"
+SRC_URI[sha256sum] = "070a95aa9942bd67e8ba4012962df74143bffb9998301ac097dab5e1437000d8"
+
+do_install () {
+
+    install -d ${D}${libdir}
+    install -d ${D}${includedir}
+
+    cp ${S}/g2d/usr/lib/*.so* ${D}${libdir}
+    cp -Pr ${S}/g2d/usr/include/* ${D}${includedir}
+    cp -r ${S}/gpu-demos/opt ${D}
+}
+
+RDEPENDS_${PN} = "libgal-imx"
+
+FILES_${PN} = "${libdir}/libg2d* /opt"
+FILES_${PN}-dev = "${includedir}"
+INSANE_SKIP_${PN} = "ldflags"
+
+COMPATIBLE_MACHINE = "(mx6|mx7ulp)"