From b4c30009f0731a2039e0bd3361a611ddb56eadfd Mon Sep 17 00:00:00 2001
From: Lauren Post <lauren.post@freescale.com>
Date: Mon, 16 Dec 2013 15:47:29 -0600
Subject: [PATCH] gpu-viv-g2d: Update to 3.10.17-1.0.0_beta

Add gmem tool installation
Upgrade to p13 version

Signed-off-by: Lauren Post <lauren.post@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../recipes-graphics/gpu-viv-g2d/gpu-viv-g2d.inc         | 4 +++-
 .../gpu-viv-g2d/gpu-viv-g2d_3.10.17-1.0.0.bb             | 6 ++++++
 .../gpu-viv-g2d/gpu-viv-g2d_3.10.9-1.0.0.bb              | 9 ---------
 3 files changed, 9 insertions(+), 10 deletions(-)
 create mode 100644 meta-fsl-arm/recipes-graphics/gpu-viv-g2d/gpu-viv-g2d_3.10.17-1.0.0.bb
 delete mode 100644 meta-fsl-arm/recipes-graphics/gpu-viv-g2d/gpu-viv-g2d_3.10.9-1.0.0.bb

diff --git a/meta-fsl-arm/recipes-graphics/gpu-viv-g2d/gpu-viv-g2d.inc b/meta-fsl-arm/recipes-graphics/gpu-viv-g2d/gpu-viv-g2d.inc
index 5da2139d..c5b70aa2 100644
--- a/meta-fsl-arm/recipes-graphics/gpu-viv-g2d/gpu-viv-g2d.inc
+++ b/meta-fsl-arm/recipes-graphics/gpu-viv-g2d/gpu-viv-g2d.inc
@@ -13,7 +13,9 @@ inherit fsl-eula-unpack
 
 PE = "1"
 
-SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
+# FIXME: Drop 'beta' suffix for GA release
+SRC_URI = "${FSL_MIRROR}/${PN}-${@'${PV}'.replace('1.0.0', '1.0.0-beta')}.bin;fsl-eula=true"
+S = "${WORKDIR}/${PN}-${@'${PV}'.replace('1.0.0', '1.0.0-beta')}"
 
 PACKAGES += "libg2d"
 
diff --git a/meta-fsl-arm/recipes-graphics/gpu-viv-g2d/gpu-viv-g2d_3.10.17-1.0.0.bb b/meta-fsl-arm/recipes-graphics/gpu-viv-g2d/gpu-viv-g2d_3.10.17-1.0.0.bb
new file mode 100644
index 00000000..997ecbd1
--- /dev/null
+++ b/meta-fsl-arm/recipes-graphics/gpu-viv-g2d/gpu-viv-g2d_3.10.17-1.0.0.bb
@@ -0,0 +1,6 @@
+# Copyright (C) 2013, 2014 Freescale Semiconductor
+
+include gpu-viv-g2d.inc
+
+SRC_URI[md5sum] = "1dd925c48d36b7029d9fe2522d0700c7"
+SRC_URI[sha256sum] = "c9ec4b0daa476ff02b2964998a113f53a85f4d9606c4ec617858f33cab2af203"
diff --git a/meta-fsl-arm/recipes-graphics/gpu-viv-g2d/gpu-viv-g2d_3.10.9-1.0.0.bb b/meta-fsl-arm/recipes-graphics/gpu-viv-g2d/gpu-viv-g2d_3.10.9-1.0.0.bb
deleted file mode 100644
index 87e67eb3..00000000
--- a/meta-fsl-arm/recipes-graphics/gpu-viv-g2d/gpu-viv-g2d_3.10.9-1.0.0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (C) 2013 Freescale Semiconductor
-
-include gpu-viv-g2d.inc
-
-LIC_FILES_CHKSUM = "file://usr/include/g2d.h;endline=7;md5=861ebad4adc7236f8d1905338abd7eb2"
-
-SRC_URI[md5sum] = "3d9849a60cb488a906aeb14f966effad"
-SRC_URI[sha256sum] = "9c29b602626961f9ab93a6231c2de55cde406629ec94c4348cb2048056926195"
-
-- 
2.40.1