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

2 files changed, 5 insertions, 5 deletions

diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index bb86dd7..9d6effc 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -30,11 +30,11 @@
   <project name="meta-mingw"
            remote="qtyocto"
            path="sources/meta-mingw"
-           revision="2844575c17f3875aa2ad0e83d600f52a1893390d"/>
+           revision="bf2d66bbb26afbf4c22744af925daa53f61d98e1"/>
 
   <project name="meta-fsl-arm"
            remote="yocto"
-           revision="8d22b44716fa624ff87383c36d222d9e28d0b267"
+           revision="c9e576bdae8c481f5a836531c7865fe8b8a5a36f"
            path="sources/meta-fsl-arm"
            groups="notdefault,external,fsl,toradex,architech,ti,bbb,smx6,renesas"/>
   <project name="meta-ti"
@@ -49,7 +49,7 @@
            groups="notdefault,external,rpi"/>
   <project name="meta-fsl-arm-extra"
            remote="freescale"
-           revision="8fdde39f732be9e1ee9505a04c579073114459e7"
+           revision="dd074c47af53948041f6c5671e519fbf815b0980"
            path="sources/meta-fsl-arm-extra"
            groups="notdefault,external,fsl,toradex,architech,smx6"/>
   <project name="meta-beagleboard"
@@ -59,7 +59,7 @@
            groups="notdefault,external,bbb"/>
   <project name="meta-toradex"
            remote="toradex"
-           revision="eca5937408c75a997b160bd1b92e1496b07421cf"
+           revision="485643678b2d39d37b1cc9d1aa2200bb934b08de"
            path="sources/meta-toradex"
            groups="notdefault,external,toradex"/>
   <project name="meta-tibidabo"
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)