summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2017-10-09 11:12:22 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2017-10-12 13:16:22 +0000
commit7c988467d12fe6507e6ca2275c65d90b247a3e12 (patch)
tree553264a159c3ea16f4e487ab3584a62daeaf2d6e
parente6e7c85a095c32ea7766fc61f4a7138c1328ec4c (diff)
downloadmeta-boot2qt-7c988467d12fe6507e6ca2275c65d90b247a3e12.tar.gz
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>
-rw-r--r--conf/distro/include/apalis-imx6.conf2
-rw-r--r--conf/distro/include/colibri-imx6.conf2
-rw-r--r--conf/distro/include/colibri-imx7.conf2
-rw-r--r--scripts/manifest.xml6
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
31 31
32DEPLOY_CONF_NAME = "Toradex Apalis iMX6" 32DEPLOY_CONF_NAME = "Toradex Apalis iMX6"
33 33
34IMAGE_FSTYPES += "teziimg"
35
34BOOT_SCRIPTS += " \ 36BOOT_SCRIPTS += " \
35 u-boot-${MACHINE}.imx-spl:${MACHINEDIR}/u-boot.imx-spl \ 37 u-boot-${MACHINE}.imx-spl:${MACHINEDIR}/u-boot.imx-spl \
36 SPL-${MACHINE}-spl:${MACHINEDIR}/SPL \ 38 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
31 31
32DEPLOY_CONF_NAME = "Toradex Colibri iMX6" 32DEPLOY_CONF_NAME = "Toradex Colibri iMX6"
33 33
34IMAGE_FSTYPES += "teziimg"
35
34BOOT_SCRIPTS += " \ 36BOOT_SCRIPTS += " \
35 u-boot-${MACHINE}.imx-spl:${MACHINEDIR}/u-boot.imx-spl \ 37 u-boot-${MACHINE}.imx-spl:${MACHINEDIR}/u-boot.imx-spl \
36 SPL-${MACHINE}-spl:${MACHINEDIR}/SPL \ 38 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
31 31
32DEPLOY_CONF_NAME = "Toradex Colibri iMX7" 32DEPLOY_CONF_NAME = "Toradex Colibri iMX7"
33 33
34IMAGE_FSTYPES += "teziimg"
35
34BOOT_SCRIPTS += " \ 36BOOT_SCRIPTS += " \
35 u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \ 37 u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \
36 " 38 "
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 @@
33 33
34 <project name="meta-freescale" 34 <project name="meta-freescale"
35 remote="freescale" 35 remote="freescale"
36 revision="fa774ad7fb797957601a8c9fee45af453fea34b7" 36 revision="05681fdf8298bb441c15135eae424c7601b07e98"
37 path="sources/meta-freescale" 37 path="sources/meta-freescale"
38 groups="notdefault,external,fsl,toradex,ti,smx6,renesas-gen3"/> 38 groups="notdefault,external,fsl,toradex,ti,smx6,renesas-gen3"/>
39 <project name="meta-freescale-3rdparty" 39 <project name="meta-freescale-3rdparty"
@@ -73,12 +73,12 @@
73 groups="notdefault,external,renesas-gen3"/> 73 groups="notdefault,external,renesas-gen3"/>
74 <project name="meta-toradex-bsp-common" 74 <project name="meta-toradex-bsp-common"
75 remote="toradex" 75 remote="toradex"
76 revision="b128af95613557af8deaea30212e89e6316eab88" 76 revision="429d294f9b271433d4d0130530677dc417e6ec6e"
77 path="sources/meta-toradex-bsp-common" 77 path="sources/meta-toradex-bsp-common"
78 groups="notdefault,external,toradex"/> 78 groups="notdefault,external,toradex"/>
79 <project name="meta-toradex-nxp" 79 <project name="meta-toradex-nxp"
80 remote="toradex" 80 remote="toradex"
81 revision="89a17628efef01fd5af202e88d79188df08f636f" 81 revision="45c33b79a734d016dddb997c1895b53202286f23"
82 path="sources/meta-toradex-nxp" 82 path="sources/meta-toradex-nxp"
83 groups="notdefault,external,toradex"/> 83 groups="notdefault,external,toradex"/>
84 84