4 files changed, 38 insertions, 199 deletions

diff --git a/scripts/configure-qtcreator.sh b/scripts/configure-qtcreator.sh
deleted file mode 100755
index d6e9c07..0000000
--- a/scripts/configure-qtcreator.sh
+++ /dev/null
@@ -1,173 +0,0 @@
-#!/bin/bash
-############################################################################
-##
-## 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$
-##
-############################################################################
-
-set -e
-
-ABI="arm-linux-generic-elf-32bit"
-CONFIG=""
-
-printUsage ()
-{
-    echo "Usage: $0 --config <environment-setup-file> [--remove] [--qtcreator <path>] [--name <basename>] [--appman]"
-}
-
-while test -n "$1"; do
-  case "$1" in
-    "--remove")
-      REMOVEONLY=1
-      ;;
-    "--appman")
-      APPMAN=1
-      ;;
-    "--qtcreator")
-      shift
-      QTCREATOR=$1
-      ;;
-    "--config")
-      shift
-      CONFIG=$1
-      ;;
-    "--name")
-      shift
-      NAME=$1
-      ;;
-    *)
-      printUsage
-      exit 0
-      ;;
-  esac
-  shift
-done
-
-if [ ! -f "$CONFIG" ]; then
-   printUsage
-   exit 1
-fi
-
-if [ -z "${QTCREATOR}" ]; then
-    SDKTOOL="${HOME}/Qt/Tools/QtCreator/libexec/qtcreator/sdktool"
-else
-    SDKTOOL="${QTCREATOR}/libexec/qtcreator/sdktool"
-fi
-if [ ! -x ${SDKTOOL} ]; then
-    echo "Cannot find 'sdktool' from QtCreator"
-    printUsage
-    exit 1
-fi
-
-source $CONFIG
-
-MKSPEC="devices/linux-oe-generic-g++"
-MKSPECPATH=$(find ${OECORE_TARGET_SYSROOT} -name $(basename ${MKSPEC}))
-if [ ! -d "${MKSPECPATH}" ]; then
-    echo "Error: could not find mkspec ${MKSPEC} from the toolchain"
-    exit 1
-fi
-
-MACHINE=$(grep '^MACHINE' ${MKSPECPATH}/../../qdevice.pri | cut -d'=' -f2 | tr -d ' ')
-
-RELEASE=$(qmake -query QT_VERSION)
-
-NAME=${NAME:-"Custom Qt ${RELEASE} ${MACHINE}"}
-BASEID="byos.${RELEASE}.${MACHINE}"
-
-${SDKTOOL} rmKit --id ${BASEID}.kit 2>/dev/null || true
-${SDKTOOL} rmKit --id ${BASEID}.am.kit 2>/dev/null || true
-${SDKTOOL} rmQt --id ${BASEID}.qt || true
-${SDKTOOL} rmQt --id ${BASEID}.am.qt || true
-${SDKTOOL} rmTC --id ProjectExplorer.ToolChain.Gcc:${BASEID}.gcc || true
-${SDKTOOL} rmTC --id ProjectExplorer.ToolChain.Gcc:${BASEID}.g++ || true
-${SDKTOOL} rmDebugger --id ${BASEID}.gdb 2>/dev/null || true
-
-if [ -n "${REMOVEONLY}" ]; then
-    echo "Kit removed: ${NAME}"
-    exit 0
-fi
-
-${SDKTOOL} addTC \
-    --id "ProjectExplorer.ToolChain.Gcc:${BASEID}.gcc" \
-    --name "GCC (${NAME})" \
-    --path "$(type -p ${CC})" \
-    --abi "${ABI}" \
-    --language 1
-
-${SDKTOOL} addTC \
-    --id "ProjectExplorer.ToolChain.Gcc:${BASEID}.g++" \
-    --name "G++ (${NAME})" \
-    --path "$(type -p ${CXX})" \
-    --abi "${ABI}" \
-    --language 2
-
-${SDKTOOL} addDebugger \
-    --id "${BASEID}.gdb" \
-    --name "GDB (${NAME})" \
-    --engine 1 \
-    --binary "$(type -p ${GDB})" \
-    --abis "${ABI}"
-
-${SDKTOOL} addQt \
-    --id "${BASEID}.qt" \
-    --name "${NAME}" \
-    --type "Qdb.EmbeddedLinuxQt" \
-    --qmake "$(type -p qmake)"
-
-${SDKTOOL} addKit \
-    --id "${BASEID}.kit" \
-    --name "${NAME}" \
-    --qt "${BASEID}.qt" \
-    --debuggerid "${BASEID}.gdb" \
-    --sysroot "${SDKTARGETSYSROOT}" \
-    --devicetype "QdbLinuxOsType" \
-    --Ctoolchain "ProjectExplorer.ToolChain.Gcc:${BASEID}.gcc" \
-    --Cxxtoolchain "ProjectExplorer.ToolChain.Gcc:${BASEID}.g++" \
-    --icon ":/boot2qt/images/B2Qt_QtC_icon.png" \
-    --mkspec "${MKSPEC}"
-
-if [ -n "${APPMAN}" ]; then
-    ${SDKTOOL} addQt \
-        --id "${BASEID}.am.qt" \
-        --name "${NAME} [Application Manager]" \
-        --type "AM.Qt" \
-        --qmake "$(type -p qmake)"
-
-    ${SDKTOOL} addKit \
-        --id "${BASEID}.am.kit" \
-        --name "${NAME} [Application Manager]" \
-        --qt "${BASEID}.am.qt" \
-        --debuggerid "${BASEID}.gdb" \
-        --sysroot "${SDKTARGETSYSROOT}" \
-        --devicetype "AM.Device.Type" \
-        --Ctoolchain "ProjectExplorer.ToolChain.Gcc:${BASEID}.gcc" \
-        --Cxxtoolchain "ProjectExplorer.ToolChain.Gcc:${BASEID}.g++" \
-        --icon ":/boot2qt/images/B2Qt_QtC_icon.png" \
-        --mkspec "${MKSPEC}"
-fi
-
-echo "Configured Qt Creator with new kit: ${NAME}"
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index fb900be..9a87860 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -13,52 +13,54 @@
   <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"/>
+  <remote fetch="git://github.com/toradex" name="toradex-github"/>
 
   <project name="poky"
            remote="yocto"
-           revision="4f6027c30ae2b07a238e7fec63f69169e6a70cf9"
+           revision="b9ad197bbc88cad4ef8d2245a2d262b8d8dd757e"
            path="sources/poky"/>
   <project name="meta-openembedded"
            remote="oe-mirror"
-           revision="b40116cf457b88a2db14b86fda9627fb34d56ae6"
+           revision="b2ce52334cf88e07f703cf25ced92302edd5b0e9"
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="qtyocto"
-           revision="5d375076a9c2b2e39f99012d3519a1cb2ff5811d"
+           revision="d6b6664ef23c38db48e48be36b90a34ae92dc558"
            path="sources/meta-qt5"/>
   <project name="meta-mingw"
            remote="qtyocto"
-           path="sources/meta-mingw"
-           revision="4a621def8529c3a55c6fcaef72e3b1832a9327b3"/>
+           revision="27ccecd47b5e745d4c6a11708dd42a90cc235fb3"
+           path="sources/meta-mingw"/>
 
   <project name="meta-freescale"
            remote="freescale"
-           revision="05681fdf8298bb441c15135eae424c7601b07e98"
+           revision="06178400afbd641a6709473fd21d893dcd3cfbfa"
            path="sources/meta-freescale"
-           groups="notdefault,external,fsl,toradex,ti,smx6,renesas-gen3"/>
+           groups="notdefault,external,fsl,toradex,ti,smx6,renesas-gen3,boundary,fsl-imx8"/>
   <project name="meta-freescale-3rdparty"
            remote="freescale"
-           revision="1879485e63ce369292c89b5902ff6df13509090b"
+           revision="9613dbc02ca970122a01c935bc9e5789ced73a9d"
            path="sources/meta-freescale-3rdparty"
-           groups="notdefault,external,fsl,toradex,smx6"/>
+           groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8"/>
   <project name="meta-ti"
            remote="yocto"
-           revision="0862a33b8d642e5fad031a78f90410d497453415"
+           revision="aca8f5d6ff8a529e00bdeae5b401c791ed6ecb2b"
            path="sources/meta-ti"
            groups="notdefault,external,ti"/>
   <project name="meta-raspberrypi"
            remote="yocto"
-           revision="380bf2ff445c2049bdea15f3bb36e8cb36540345"
+           revision="8ba2d6fc80b31c87d25c87c863e2a77752b07c3c"
            path="sources/meta-raspberrypi"
            groups="notdefault,external,rpi"/>
   <project name="meta-intel"
            remote="intel"
-           revision="6add41510412ca196efb3e4f949d403a8b6f35d7"
+           revision="7e8f98aa326f16edd679a95f7bb2daf4256479f3"
            path="sources/meta-intel"
            groups="notdefault,external,intel"/>
   <project name="meta-tegra"
            remote="madisongh"
-           revision="fba09b70a8ac36248e5fcea611e3bb661bb089fc"
+           revision="4aea5e3785dc400e31981467f475b54e652dbd67"
            path="sources/meta-tegra"
            groups="notdefault,external,jetson"/>
   <project name="meta-renesas"
@@ -68,7 +70,7 @@
            groups="notdefault,external,renesas-gen3"/>
   <project name="meta-linaro"
            remote="linaro"
-           revision="c44bd0ebc8ca2e6201996ef7cba8b71421d3aff7"
+           revision="74dacb34c13d1c85fe4627a890b9c04940f9ffeb"
            path="sources/meta-linaro"
            groups="notdefault,external,renesas-gen3"/>
   <project name="meta-toradex-bsp-common"
@@ -81,6 +83,16 @@
            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="meta-fsl-bsp-release"
+           remote="toradex-github"
+           revision="d2b0d14c82da830584bc7f43ba1b83097c890454"
+           path="sources/meta-fsl-bsp-release"
+           groups="notdefault,external,fsl-imx8"/>
 
   <project name="nvidia-layer"
            remote="playground"
@@ -103,4 +115,3 @@
            path="sources/meta-smx6"
            groups="notdefault,internal"/>
 </manifest>
-
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index fbe8672..3045e3c 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -56,10 +56,16 @@ BUILDDIRECTORY=${BUILDDIRECTORY:-build-${MACHINE}}
 
 if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
   case ${MACHINE} in
+    apalis-imx8|imx8qmlpddr4arm2)
+      LAYERSCONF="bblayers.conf.fsl-imx8.sample"
+    ;;
     apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7)
       LAYERSCONF="bblayers.conf.toradex.sample"
     ;;
-    imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd|imx7s-warp)
+    nitrogen6x|nitrogen7)
+      LAYERSCONF="bblayers.conf.boundary.sample"
+    ;;
+    imx6qsabresd|imx6dlsabresd|imx7dsabresd|imx7s-warp)
       LAYERSCONF="bblayers.conf.fsl.sample"
     ;;
     smarc-samx6i)
@@ -83,7 +89,7 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
     emulator)
       LAYERSCONF="bblayers.conf.emulator.sample"
     ;;
-    jetson-tx1|jetson-tk1)
+    jetson-tx1|jetson-tx2|jetson-tk1)
       LAYERSCONF="bblayers.conf.jetson.sample"
     ;;
     *)
@@ -93,18 +99,14 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
   esac
 
   mkdir -p ${PWD}/${BUILDDIRECTORY}/conf
-  cp ${PWD}/sources/meta-boot2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
-
-  if [ ! -d ${PWD}/sources/meta-qt5 ]; then
-    sed -i -e '/meta-qt5/d' ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
-  fi
+  cp ${PWD}/sources/meta-boot2qt/meta-boot2qt-distro/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
 
   if [ ! -d ${PWD}/sources/meta-boot2qt/.git ]; then
     QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-boot2qt/../../../../)
   fi
 fi
 
-export TEMPLATECONF="${PWD}/sources/meta-boot2qt/conf"
+export TEMPLATECONF="${PWD}/sources/meta-boot2qt/meta-boot2qt-distro/conf"
 . sources/poky/oe-init-build-env ${BUILDDIRECTORY}
 
 # use sources from Qt SDK if that is available
diff --git a/scripts/update-qt5-modules.sh b/scripts/update-qt5-modules.sh
index e6d945f..4ae42e8 100755
--- a/scripts/update-qt5-modules.sh
+++ b/scripts/update-qt5-modules.sh
@@ -53,9 +53,8 @@ for S in $SHA1S; do
     elif [ "${PROJECT}" = "qtlocation/src/3rdparty/mapbox-gl-native" ]; then
         sed -i -e "/^SRCREV_qtlocation-mapboxgl/s/\".*\"/\"${SHA1}\"/" qtlocation_git.bb*
         echo "qtlocation (mapboxgl) -> ${SHA1}"
-    elif [ "${PROJECT}" = "tqtc-qmlcompiler" ] && [ -e "qtquickcompiler_git.bb" ]; then
-        sed -i -e "/^SRCREV/s/\".*\"/\"${SHA1}\"/" qtquickcompiler_git.bb
-        echo "qtquickcompiler -> ${SHA1}"
+    elif [ "${PROJECT}" = "qtenginio" ] || [ "${PROJECT}" = "qtquick1" ] || [ "${PROJECT}" = "qtsystems" ]; then
+        echo "${PROJECT} -> ignored"
     elif [ "$(echo *${PROJECT}*_git.bb*)" != "*${PROJECT}*_git.bb*" ]; then
         sed -i -e "/^SRCREV/s/\".*\"/\"${SHA1}\"/" *${PROJECT}*_git.bb*
         echo "${PROJECT} -> ${SHA1}"