Merge remote-tracking branch 'origin/jethro' into dev

* origin/jethro: (26 commits)
  Fix colibri- vf & imx7 partitions
  Add u-boot script for iMX7
  Fix colibri-vf and imx6 build
  Fix colibri-vf build
  Add support for Toradex Colibri-iMX7
  Updated Boundary devices kernel version to 3.14.52
  Updated neptune-ui, qtivi, and appman sha
  Update GammaRay and enable workaround for Boot2Qt compatibility
  Added QMLLive to automotive images
  Update gammaray version to fc0b87dcff40276bc1e4ad6c86674363ca576617 --> 2.5
  Change git fetch protocol from ssh to http for automotive packages
  Change b2qt-addons fetch protocol from git to http
  b2qt-ota: update repository URL
  b2qt-demos: update qtwebbrowser url
  systemd: handle bind mounts set from initramfs
  Enable QT_QPA_EGLFS_FORCEVSYNC=1 on nitrogen6x device.
  Colibri fails to build after this change, so we revert it.
  Update Qt submodule revisions
  Updated Boundary devices kernel version to 3.14.52
  Update meta-mingw version
  ...

Change-Id: I951db6a4f523eb9a6ad72dc3013702a5ef44d56c

1 files changed, 1 insertions, 1 deletions

diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index f370032..5ee1ad0 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -56,7 +56,7 @@ BUILDDIRECTORY=${BUILDDIRECTORY:-build-${MACHINE}}
 
 if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
   case ${MACHINE} in
-    apalis-imx6|colibri-imx6|colibri-vf)
+    apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7)
       LAYERSCONF="bblayers.conf.toradex.sample"
     ;;
     imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd)