3 files changed, 48 insertions, 2 deletions

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 2dfed01..0ccd952 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -88,7 +88,7 @@ get_groups() {
     apalis-imx6|colibri-imx6|colibri-vf)
       PROJECT_GROUPS="toradex"
     ;;
-    imx53qsb|imx6qsabresd|imx6dlsabresd|nitrogen6x)
+    imx53qsb|imx6qsabresd|imx6dlsabresd|nitrogen6x|smarc-samx6i)
       PROJECT_GROUPS="fsl"
     ;;
     tibidabo)
diff --git a/conf/distro/include/smarc-samx6i.conf b/conf/distro/include/smarc-samx6i.conf
new file mode 100644
index 0000000..8e69ac8
--- /dev/null
+++ b/conf/distro/include/smarc-samx6i.conf
@@ -0,0 +1,46 @@
+#############################################################################
+##
+## Copyright (C) 2014 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$
+##
+#############################################################################
+
+include conf/distro/include/imx6.inc
+
+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"
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index ce593c6..683f19f 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -52,7 +52,7 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
     apalis-imx6|colibri-imx6|colibri-vf)
       LAYERSCONF="bblayers.conf.toradex.sample"
     ;;
-    imx53qsb|imx6qsabresd|imx6dlsabresd|nitrogen6x)
+    imx53qsb|imx6qsabresd|imx6dlsabresd|nitrogen6x|smarc-samx6i)
       LAYERSCONF="bblayers.conf.fsl.sample"
     ;;
     tibidabo)