From 7c988467d12fe6507e6ca2275c65d90b247a3e12 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Mon, 9 Oct 2017 11:12:22 +0300
Subject: toradex: update to 2.7b4 release

Add support for building Toradex Tezi images
Needs fix for meta-freescale to work.

Task-number: QTBUG-61028
Change-Id: I7c26234fcaaa6b5b3cf617d3767201bb6b93db81
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
---
 conf/distro/include/apalis-imx6.conf  | 2 ++
 conf/distro/include/colibri-imx6.conf | 2 ++
 conf/distro/include/colibri-imx7.conf | 2 ++
 scripts/manifest.xml                  | 6 +++---
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf
index 294894d..4819a74 100644
--- a/conf/distro/include/apalis-imx6.conf
+++ b/conf/distro/include/apalis-imx6.conf
@@ -31,6 +31,8 @@ include conf/distro/include/toradex.inc
 
 DEPLOY_CONF_NAME = "Toradex Apalis iMX6"
 
+IMAGE_FSTYPES += "teziimg"
+
 BOOT_SCRIPTS += " \
     u-boot-${MACHINE}.imx-spl:${MACHINEDIR}/u-boot.imx-spl \
     SPL-${MACHINE}-spl:${MACHINEDIR}/SPL \
diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf
index 7cccfcc..814676b 100644
--- a/conf/distro/include/colibri-imx6.conf
+++ b/conf/distro/include/colibri-imx6.conf
@@ -31,6 +31,8 @@ include conf/distro/include/toradex.inc
 
 DEPLOY_CONF_NAME = "Toradex Colibri iMX6"
 
+IMAGE_FSTYPES += "teziimg"
+
 BOOT_SCRIPTS += " \
     u-boot-${MACHINE}.imx-spl:${MACHINEDIR}/u-boot.imx-spl \
     SPL-${MACHINE}-spl:${MACHINEDIR}/SPL \
diff --git a/conf/distro/include/colibri-imx7.conf b/conf/distro/include/colibri-imx7.conf
index 2c3b32a..6e80e00 100644
--- a/conf/distro/include/colibri-imx7.conf
+++ b/conf/distro/include/colibri-imx7.conf
@@ -31,6 +31,8 @@ include conf/distro/include/toradex.inc
 
 DEPLOY_CONF_NAME = "Toradex Colibri iMX7"
 
+IMAGE_FSTYPES += "teziimg"
+
 BOOT_SCRIPTS += " \
     u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \
     "
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 439bcfa..b04ddd4 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -33,7 +33,7 @@
 
   <project name="meta-freescale"
            remote="freescale"
-           revision="fa774ad7fb797957601a8c9fee45af453fea34b7"
+           revision="05681fdf8298bb441c15135eae424c7601b07e98"
            path="sources/meta-freescale"
            groups="notdefault,external,fsl,toradex,ti,smx6,renesas-gen3"/>
   <project name="meta-freescale-3rdparty"
@@ -73,12 +73,12 @@
            groups="notdefault,external,renesas-gen3"/>
   <project name="meta-toradex-bsp-common"
            remote="toradex"
-           revision="b128af95613557af8deaea30212e89e6316eab88"
+           revision="429d294f9b271433d4d0130530677dc417e6ec6e"
            path="sources/meta-toradex-bsp-common"
            groups="notdefault,external,toradex"/>
   <project name="meta-toradex-nxp"
            remote="toradex"
-           revision="89a17628efef01fd5af202e88d79188df08f636f"
+           revision="45c33b79a734d016dddb997c1895b53202286f23"
            path="sources/meta-toradex-nxp"
            groups="notdefault,external,toradex"/>
 
-- 
cgit v1.2.3-54-g00ecf