6 files changed, 114 insertions, 8 deletions

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 33e12e8..f9caad7 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -109,7 +109,10 @@ get_groups() {
     apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7)
       PROJECT_GROUPS="toradex"
     ;;
-    imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd|imx7s-warp)
+    nitrogen6x)
+      PROJECT_GROUPS="boundary"
+    ;;
+    imx6qsabresd|imx6dlsabresd|imx7dsabresd|imx7s-warp)
       PROJECT_GROUPS="fsl"
     ;;
     smarc-samx6i)
diff --git a/conf/bblayers.conf.boundary.sample b/conf/bblayers.conf.boundary.sample
new file mode 100644
index 0000000..b5ab9c7
--- /dev/null
+++ b/conf/bblayers.conf.boundary.sample
@@ -0,0 +1,53 @@
+############################################################################
+##
+## Copyright (C) 2018 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$
+##
+############################################################################
+
+# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+POKY_BBLAYERS_CONF_VERSION = "2"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
+
+BBLAYERS ?= " \
+  ${BSPDIR}/sources/poky/meta \
+  ${BSPDIR}/sources/poky/meta-poky \
+  ${BSPDIR}/sources/meta-boundary \
+  ${BSPDIR}/sources/meta-freescale \
+  ${BSPDIR}/sources/meta-freescale-3rdparty \
+  ${BSPDIR}/sources/meta-openembedded/meta-oe \
+  ${BSPDIR}/sources/meta-openembedded/meta-python \
+  ${BSPDIR}/sources/meta-openembedded/meta-networking \
+  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
+  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
+  ${BSPDIR}/sources/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
+  ${BSPDIR}/sources/meta-mingw \
+  ${BSPDIR}/sources/meta-qt5 \
+  "
diff --git a/conf/distro/include/boundary.inc b/conf/distro/include/boundary.inc
new file mode 100644
index 0000000..c8f5424
--- /dev/null
+++ b/conf/distro/include/boundary.inc
@@ -0,0 +1,43 @@
+############################################################################
+##
+## Copyright (C) 2018 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$
+##
+############################################################################
+
+include conf/distro/include/fsl.inc
+
+BBMASK += " \
+    meta-boundary/recipes-browser/chromium \
+    meta-boundary/recipes-core/init-ifupdown \
+    meta-boundary/recipes-mozilla/firefox \
+    "
+
+EXTRA_IMAGEDEPENDS += "u-boot u-boot-script-boundary"
+
+MACHINE_EXTRA_INSTALL += "\
+    kernel-module-qcacld \
+    linux-firmware-bdsdmac-wlan \
+    "
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index 389ac03..c1cf138 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,7 +27,7 @@
 ##
 ############################################################################
 
-include conf/distro/include/fsl.inc
+include conf/distro/include/boundary.inc
 include conf/distro/include/opencv.inc
 
 DEPLOY_CONF_NAME = "Boundary Devices i.MX6"
@@ -76,8 +76,6 @@ UBOOT_CONFIG[nitrogen6_max] = "nitrogen6_max_config"
 UBOOT_CONFIG[nitrogen6_vm1g] = "nitrogen6_vm1g_config"
 UBOOT_CONFIG[nitrogen6_vm] = "nitrogen6_vm_config"
 
-EXTRA_IMAGEDEPENDS += "u-boot u-boot-script-boundary"
-
 KERNEL_DEVICETREE += "\
     imx6dl-nit6xlite.dtb \
     "
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 59a936a..8eec940 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -13,6 +13,7 @@
   <remote fetch="git://github.com/renesas-rcar" name="renesas"/>
   <remote fetch="git://git.linaro.org/openembedded" name="linaro"/>
   <remote fetch="git://git.toradex.com" name="toradex"/>
+  <remote fetch="git://github.com/boundarydevices" name="boundary"/>
 
   <project name="poky"
            remote="yocto"
@@ -35,12 +36,12 @@
            remote="freescale"
            revision="10d8ccb5ff2c31d2a5b13e088a8ec9511cbc3e72"
            path="sources/meta-freescale"
-           groups="notdefault,external,fsl,toradex,ti,smx6,renesas-gen3"/>
+           groups="notdefault,external,fsl,toradex,ti,smx6,renesas-gen3,boundary"/>
   <project name="meta-freescale-3rdparty"
            remote="freescale"
            revision="35badbde05d4f10d4faeefc30bc126b5bd228e2e"
            path="sources/meta-freescale-3rdparty"
-           groups="notdefault,external,fsl,toradex,smx6"/>
+           groups="notdefault,external,fsl,toradex,smx6,boundary"/>
   <project name="meta-ti"
            remote="yocto"
            revision="aca8f5d6ff8a529e00bdeae5b401c791ed6ecb2b"
@@ -81,6 +82,11 @@
            revision="45c33b79a734d016dddb997c1895b53202286f23"
            path="sources/meta-toradex-nxp"
            groups="notdefault,external,toradex"/>
+  <project name="meta-boundary"
+           remote="boundary"
+           revision="42b00061076b2a6e15c1eeed7da6fc14a0dae9d8"
+           path="sources/meta-boundary"
+           groups="notdefault,external,boundary"/>
 
   <project name="nvidia-layer"
            remote="playground"
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 204ded6..e9a7012 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -59,7 +59,10 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
     apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7)
       LAYERSCONF="bblayers.conf.toradex.sample"
     ;;
-    imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd|imx7s-warp)
+    nitrogen6x)
+      LAYERSCONF="bblayers.conf.boundary.sample"
+    ;;
+    imx6qsabresd|imx6dlsabresd|imx7dsabresd|imx7s-warp)
       LAYERSCONF="bblayers.conf.fsl.sample"
     ;;
     smarc-samx6i)