[meta-freescale] [meta-fsl-demos][PATCH v2 12/13] packagegroup-fsl-tools-gpu: Rework Vivante GPU additions

[Otavio Salvador]

The Vivante GPU specific bits ought to be include for all i.MX6
variants which have the GPU. This allows for the very same
packagegroup to be used for i.MX6 UltraLite which does not have GPU
support.

Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
---
 .../packagegroups/packagegroup-fsl-tools-gpu.bb        | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb
index 1afff9c..71df6e0 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb
@@ -1,4 +1,5 @@
 # Copyright (C) 2012-2014 Freescale Semiconductor
+# Copyright (C) 2015 O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 DESCRIPTION = "Package group used by FSL Community to add the packages which provide GPU support."
@@ -12,7 +13,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 inherit packagegroup
 
 SOC_TOOLS_GPU = ""
-SOC_TOOLS_GPU_mx6 = " \
+
+SOC_TOOLS_GPU_IMX6QDLSX = " \
     imx-gpu-viv-g2d \
     fsl-gpu-sdk \
     imx-gpu-viv-tools \
@@ -20,14 +22,20 @@ SOC_TOOLS_GPU_mx6 = " \
     ${@base_contains('DISTRO_FEATURES', 'x11', \
                      'xserver-xorg-extension-viv-autohdmi', '', d)} \
 "
+SOC_TOOLS_GPU_mx6q  = "${SOC_TOOLS_GPU_IMX6QDLSX}"
+SOC_TOOLS_GPU_mx6dl = "${SOC_TOOLS_GPU_IMX6QDLSX}"
+SOC_TOOLS_GPU_mx6sx = "${SOC_TOOLS_GPU_IMX6QDLSX}"
+
 # FIXME: fsl-gpu-sdk is not supported for i.MX6 SoloLite due to lack of
 # OpenVG support and is intended to add in future release. 
 # i.MX6 SoloLite do not support apitrace because of its dependency on gles2.
-
-SOC_TOOLS_GPU_remove_mx6sl = " \
-    fsl-gpu-sdk \
-    imx-gpu-viv-tools-apitrace \
+SOC_TOOLS_GPU_mx6sl = " \
+    imx-gpu-viv-g2d \
+    imx-gpu-viv-tools \
+    ${@base_contains('DISTRO_FEATURES', 'x11', \
+                     'xserver-xorg-extension-viv-autohdmi', '', d)} \
 "
+
 RDEPENDS_${PN} = " \
     ${SOC_TOOLS_GPU} \
 "
-- 
2.5.0