Added support for DC3217IYE (nuc) device.

Removed imx6 specific wayland configurations from packagegroup-b2qt-embedded-toolchain-target.bb to imx6.inc.

Change-Id: I2b700b21bbf23fbaf59dcb8558b0b96b11bb81ec
Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>

8 files changed, 48 insertions, 6 deletions

diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf
index 2ceb4fe..119161e 100644
--- a/conf/distro/include/apalis-imx6.conf
+++ b/conf/distro/include/apalis-imx6.conf
@@ -43,7 +43,7 @@ MACHINE_EXTRA_INSTALL = "\
         ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
         "
 
-MACHINE_EXTRA_INSTALL_SDK = " \
+MACHINE_EXTRA_INSTALL_SDK += " \
         libgal-mx6 \
         libegl-mx6 \
         libegl-mx6-dev \
diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf
index fcf716a..6b8399a 100644
--- a/conf/distro/include/colibri-imx6.conf
+++ b/conf/distro/include/colibri-imx6.conf
@@ -42,7 +42,7 @@ MACHINE_EXTRA_INSTALL = "\
         ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
         "
 
-MACHINE_EXTRA_INSTALL_SDK = " \
+MACHINE_EXTRA_INSTALL_SDK += " \
         libgal-mx6 \
         libegl-mx6 \
         libegl-mx6-dev \
diff --git a/conf/distro/include/imx6.inc b/conf/distro/include/imx6.inc
index 5cb3814..4b4f280 100644
--- a/conf/distro/include/imx6.inc
+++ b/conf/distro/include/imx6.inc
@@ -1,2 +1,7 @@
 BBMASK ?= " "
 BBMASK .= "|meta-fsl-arm/qt5-layer/recipes-qt/qt5"
+
+MACHINE_EXTRA_INSTALL_SDK = " \
+        ${@base_contains("DISTRO_FEATURES", "wayland", "libwayland-egl-mx6-dev", "", d)} \
+        "
+
diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf
index c677500..82c98a4 100644
--- a/conf/distro/include/imx6qsabresd.conf
+++ b/conf/distro/include/imx6qsabresd.conf
@@ -47,7 +47,7 @@ MACHINE_EXTRA_INSTALL = "\
         libopencv-objdetect \
         "
 
-MACHINE_EXTRA_INSTALL_SDK = " \
+MACHINE_EXTRA_INSTALL_SDK += " \
         libgal-mx6 \
         libegl-mx6 \
         libegl-mx6-dev \
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index 0b41513..0abf640 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -60,7 +60,7 @@ MACHINE_EXTRA_INSTALL = "\
         libopencv-objdetect \
         "
 
-MACHINE_EXTRA_INSTALL_SDK = " \
+MACHINE_EXTRA_INSTALL_SDK += " \
         libgal-mx6 \
         libegl-mx6 \
         libegl-mx6-dev \
diff --git a/conf/distro/include/nuc.conf b/conf/distro/include/nuc.conf
new file mode 100644
index 0000000..ad2a097
--- /dev/null
+++ b/conf/distro/include/nuc.conf
@@ -0,0 +1,37 @@
+#############################################################################
+##
+## Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+DISTRO_FEATURES_DEFAULT += "wayland weston"
+
+DISTRO_FEATURES_remove = "usbgadget"
+
+IMAGE_FSTYPES += " hddimg"
+
+MACHINE_EXTRA_INSTALL = "\
+        wayland \
+        mesa-megadriver \
+        "
+
+MACHINE_EXTRA_INSTALL_SDK = " \
+        mesa-dev \
+        "
+
diff --git a/conf/distro/include/smarc-samx6i.conf b/conf/distro/include/smarc-samx6i.conf
index 8e69ac8..ff8bdd5 100644
--- a/conf/distro/include/smarc-samx6i.conf
+++ b/conf/distro/include/smarc-samx6i.conf
@@ -35,7 +35,7 @@ MACHINE_EXTRA_INSTALL = "\
         kernel-devicetree \
         "
 
-MACHINE_EXTRA_INSTALL_SDK = " \
+MACHINE_EXTRA_INSTALL_SDK += " \
         libgal-mx6 \
         libegl-mx6 \
         libegl-mx6-dev \
diff --git a/conf/distro/include/tibidabo.conf b/conf/distro/include/tibidabo.conf
index cec9fd5..b50338d 100644
--- a/conf/distro/include/tibidabo.conf
+++ b/conf/distro/include/tibidabo.conf
@@ -38,7 +38,7 @@ MACHINE_EXTRA_INSTALL = "\
         ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
         "
 
-MACHINE_EXTRA_INSTALL_SDK = " \
+MACHINE_EXTRA_INSTALL_SDK += " \
         libgal-mx6 \
         libegl-mx6 \
         libegl-mx6-dev \