Refactor i.MX6 configurations

Change-Id: I6b86b5b6084377bcca4bbc7cd1e01e772683084e
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

9 files changed, 97 insertions, 101 deletions

diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf
index c5d2b3a2..fdc211dd 100644
--- a/conf/distro/include/apalis-imx6.conf
+++ b/conf/distro/include/apalis-imx6.conf
@@ -29,6 +29,7 @@
 
 include conf/distro/include/toradex.inc
 include conf/distro/include/imx6.inc
+include conf/distro/include/imx6-egl.inc
 
 DEPLOY_CONF_NAME = "Toradex Apalis iMX6"
 
@@ -51,21 +52,5 @@ BOOT_SCRIPTS += " \
     flash_blk-${MACHINE}.img:flash_blk.img \
     "
 
-MACHINE_EXTRA_INSTALL = "\
-        libgal-mx6 \
-        libegl-mx6 \
-        libgles2-mx6 \
-        ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
-        ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
-        "
-
-MACHINE_EXTRA_INSTALL_SDK += " \
-        libgal-mx6 \
-        libegl-mx6 \
-        libegl-mx6-dev \
-        libgles2-mx6 \
-        libgles2-mx6-dev \
-        "
-
 SERIAL_CONSOLES = "115200;ttymxc0 \
                    115200;ttymxc1"
diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf
index fa3dba01..6427ee95 100644
--- a/conf/distro/include/colibri-imx6.conf
+++ b/conf/distro/include/colibri-imx6.conf
@@ -29,6 +29,7 @@
 
 include conf/distro/include/toradex.inc
 include conf/distro/include/imx6.inc
+include conf/distro/include/imx6-egl.inc
 
 DEPLOY_CONF_NAME = "Toradex Colibri iMX6"
 
@@ -46,19 +47,3 @@ BOOT_SCRIPTS += " \
     flash_mmc-${MACHINE}.img:flash_mmc.img \
     flash_blk-${MACHINE}.img:flash_blk.img \
     "
-
-MACHINE_EXTRA_INSTALL = "\
-        libgal-mx6 \
-        libegl-mx6 \
-        libgles2-mx6 \
-        ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
-        ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
-        "
-
-MACHINE_EXTRA_INSTALL_SDK += " \
-        libgal-mx6 \
-        libegl-mx6 \
-        libegl-mx6-dev \
-        libgles2-mx6 \
-        libgles2-mx6-dev \
-        "
diff --git a/conf/distro/include/imx6-egl.inc b/conf/distro/include/imx6-egl.inc
new file mode 100644
index 00000000..8c4bbcd5
--- /dev/null
+++ b/conf/distro/include/imx6-egl.inc
@@ -0,0 +1,41 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+MACHINE_EXTRA_INSTALL += "\
+    libegl-mx6 \
+    libgles2-mx6 \
+    "
+
+MACHINE_EXTRA_INSTALL_SDK += " \
+    libegl-mx6 \
+    libegl-mx6-dev \
+    libgles2-mx6 \
+    libgles2-mx6-dev \
+    ${@base_contains("DISTRO_FEATURES", "wayland", "libwayland-egl-mx6-dev", "", d)} \
+    "
diff --git a/conf/distro/include/imx6-opencv.inc b/conf/distro/include/imx6-opencv.inc
new file mode 100644
index 00000000..a1d37dfa
--- /dev/null
+++ b/conf/distro/include/imx6-opencv.inc
@@ -0,0 +1,39 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+MACHINE_EXTRA_INSTALL += "\
+    libopencv-core \
+    libopencv-imgproc \
+    libopencv-objdetect \
+    "
+
+MACHINE_EXTRA_INSTALL_SDK += " \
+    opencv-dev \
+    "
+
diff --git a/conf/distro/include/imx6.inc b/conf/distro/include/imx6.inc
index 8f5a2fd2..e686e851 100644
--- a/conf/distro/include/imx6.inc
+++ b/conf/distro/include/imx6.inc
@@ -32,7 +32,13 @@ BBMASK .= "|meta-fsl-arm/qt5-layer/recipes-qt/qt5"
 
 IMAGE_FSTYPES += "ext3 sdcard"
 
-MACHINE_EXTRA_INSTALL_SDK = " \
-        ${@base_contains("DISTRO_FEATURES", "wayland", "libwayland-egl-mx6-dev", "", d)} \
-        "
+MACHINE_EXTRA_INSTALL += "\
+    libgal-mx6 \
+    ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
+    ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
+    "
+
+MACHINE_EXTRA_INSTALL_SDK += " \
+    libgal-mx6 \
+    "
 
diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf
index d6d61185..1463c671 100644
--- a/conf/distro/include/imx6qsabresd.conf
+++ b/conf/distro/include/imx6qsabresd.conf
@@ -28,6 +28,8 @@
 ############################################################################
 
 include conf/distro/include/imx6.inc
+include conf/distro/include/imx6-egl.inc
+include conf/distro/include/imx6-opencv.inc
 
 DEPLOY_CONF_NAME = "Freescale SABRE SD i.MX6Quad"
 
@@ -45,26 +47,6 @@ BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy"
 
 DISTRO_FEATURES_DEFAULT += "wayland"
 
-MACHINE_EXTRA_INSTALL = "\
-        libgal-mx6 \
-        libegl-mx6 \
-        libgles2-mx6 \
-        ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
-        ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
-        libopencv-core \
-        libopencv-imgproc \
-        libopencv-objdetect \
-        "
-
-MACHINE_EXTRA_INSTALL_SDK += " \
-        libgal-mx6 \
-        libegl-mx6 \
-        libegl-mx6-dev \
-        libgles2-mx6 \
-        libgles2-mx6-dev \
-        opencv-dev \
-        "
-
 KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture"
 
 # add support for both imx6qsabresd and imx6dlsabresd
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index 942c8fd6..7986cb78 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -28,6 +28,8 @@
 ############################################################################
 
 include conf/distro/include/imx6.inc
+include conf/distro/include/imx6-egl.inc
+include conf/distro/include/imx6-opencv.inc
 
 DEPLOY_CONF_NAME = "Boundary Devices i.MX6"
 
@@ -94,24 +96,7 @@ KERNEL_DEVICETREE += "imx6dl-nit6xlite.dtb"
 DISTRO_FEATURES_DEFAULT += "wayland"
 
 MACHINE_EXTRA_INSTALL = "\
-        libgal-mx6 \
-        libegl-mx6 \
-        libgles2-mx6 \
-        ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
-        ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
         bcm4330-nvram-config \
-        libopencv-core \
-        libopencv-imgproc \
-        libopencv-objdetect \
-        "
-
-MACHINE_EXTRA_INSTALL_SDK += " \
-        libgal-mx6 \
-        libegl-mx6 \
-        libegl-mx6-dev \
-        libgles2-mx6 \
-        libgles2-mx6-dev \
-        opencv-dev \
         "
 
 ADB_PRODUCTID = "0x0d02"
diff --git a/conf/distro/include/smarc-samx6i.conf b/conf/distro/include/smarc-samx6i.conf
index 3582ade4..95388b62 100644
--- a/conf/distro/include/smarc-samx6i.conf
+++ b/conf/distro/include/smarc-samx6i.conf
@@ -28,6 +28,7 @@
 ############################################################################
 
 include conf/distro/include/imx6.inc
+include conf/distro/include/imx6-egl.inc
 
 DEPLOY_CONF_NAME = "Kontron SMARC-sAMX6i"
 
@@ -36,22 +37,9 @@ KERNEL_IMAGETYPE = "uImage"
 BOOTFS_CONTENT = " "
 
 MACHINE_EXTRA_INSTALL = "\
-        libgal-mx6 \
-        libegl-mx6 \
-        libgles2-mx6 \
-        ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
-        ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
         kernel-devicetree \
         "
 
-MACHINE_EXTRA_INSTALL_SDK += " \
-        libgal-mx6 \
-        libegl-mx6 \
-        libegl-mx6-dev \
-        libgles2-mx6 \
-        libgles2-mx6-dev \
-        "
-
 KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture"
 
 BBMASK ?= " "
diff --git a/conf/distro/include/tibidabo.conf b/conf/distro/include/tibidabo.conf
index 706ebfb1..01e1f63a 100644
--- a/conf/distro/include/tibidabo.conf
+++ b/conf/distro/include/tibidabo.conf
@@ -28,6 +28,7 @@
 ############################################################################
 
 include conf/distro/include/imx6.inc
+include conf/distro/include/imx6-egl.inc
 
 DEPLOY_CONF_NAME = "ArchiTech Tibidabo"
 
@@ -45,20 +46,4 @@ PREFERRED_PROVIDER_virtual/libgles1_mx6q = "gpu-viv-bin-mx6q"
 PREFERRED_PROVIDER_virtual/libgles2_mx6q = "gpu-viv-bin-mx6q"
 PREFERRED_PROVIDER_virtual/libgl_mx6q = "gpu-viv-bin-mx6q"
 
-MACHINE_EXTRA_INSTALL = "\
-        libgal-mx6 \
-        libegl-mx6 \
-        libgles2-mx6 \
-        ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
-        ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
-        "
-
-MACHINE_EXTRA_INSTALL_SDK += " \
-        libgal-mx6 \
-        libegl-mx6 \
-        libegl-mx6-dev \
-        libgles2-mx6 \
-        libgles2-mx6-dev \
-        "
-
 KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture"