Merge remote-tracking branch 'origin/pyro' into sumo

* origin/pyro: (29 commits)
  meta-qt5: update layer
  qt5: Enable Link Time Optimization
  toradex: add Qt marketing slides
  toradex: add support for colibri-imx6ull
  rpi: include mcp2515 overlay for CAN support
  qtdeviceutilities: update to latest version
  boot2qt-demos: update revision
  boot2qt-addons: update components
  meta-qt5: update layer
  boot2qt-launcher: update to latest version
  qtdeviceutilities: update to latest version
  Do not use Link Time Optimization
  boot2qt-demo: update demo videos
  qtquicktimeline: fetch from public repository
  boot2qt-demos: no need to patch demos anymore
  Don't use git folder to check if we are using SDK sources
  toradex: include easy installer file in the release 7z
  toradex: Add Boot2Qt material to the Tezi image
  meta-qt5: update layer
  qt5: update submodules
  ...

Change-Id: I23e9b0a018328d7be1441616c07c526e2db61be2

1 files changed, 2 insertions, 5 deletions

diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 3045e3c..44f529c 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -59,7 +59,7 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
     apalis-imx8|imx8qmlpddr4arm2)
       LAYERSCONF="bblayers.conf.fsl-imx8.sample"
     ;;
-    apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7)
+    apalis-imx6|colibri-imx6|colibri-imx6ull|colibri-vf|colibri-imx7)
       LAYERSCONF="bblayers.conf.toradex.sample"
     ;;
     nitrogen6x|nitrogen7)
@@ -71,9 +71,6 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
     smarc-samx6i)
       LAYERSCONF="bblayers.conf.smx6.sample"
     ;;
-    beagleboard|beaglebone|am335x-evm)
-      LAYERSCONF="bblayers.conf.ti.sample"
-    ;;
     raspberrypi0|raspberrypi|raspberrypi2|raspberrypi3)
       LAYERSCONF="bblayers.conf.rpi.sample"
     ;;
@@ -101,7 +98,7 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
   mkdir -p ${PWD}/${BUILDDIRECTORY}/conf
   cp ${PWD}/sources/meta-boot2qt/meta-boot2qt-distro/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf
 
-  if [ ! -d ${PWD}/sources/meta-boot2qt/.git ]; then
+  if [ -e ${PWD}/sources/meta-boot2qt/.QT-FOR-DEVICE-CREATION-LICENSE-AGREEMENT ]; then
     QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-boot2qt/../../../../)
   fi
 fi