diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2019-04-05 10:43:30 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-05-29 13:16:51 +0300 |
| commit | a1bd62f6157b1251a6956cf85f6191e34837178f (patch) | |
| tree | 1a6b7956e42633c2b2f743355e793de98eab407a /scripts | |
| parent | 10723551aceb7dba95d04c229d70b7c005806ace (diff) | |
imx8: update meta layer
For NXP boards, use sumo-4.14.98-2.0.0_ga branch for meta-fsl-bsp-release,
and add configuration form NXP i.MX 8QuadMax MEK and 8MQuad EVK boards.
For Toradex board, use toradex-sumo-4.14.78-1.0.0_ga-bringup branch for the
same layer, and add configuration for Colibri-iMX8QXP board.
Task-number: QTBUG-73355
Task-number: QTBUG-73372
Change-Id: Ib0d7669d9a06f65a891f9ec849cb6ed5ba830688
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/manifest.xml | 14 | ||||
| -rwxr-xr-x | scripts/setup-environment.sh | 5 |
2 files changed, 14 insertions, 5 deletions
diff --git a/scripts/manifest.xml b/scripts/manifest.xml index ba7e7f18..d375521a 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -15,6 +15,7 @@ <remote fetch="git://git.toradex.com" name="toradex"/> <remote fetch="git://github.com/boundarydevices" name="boundary"/> <remote fetch="git://github.com/toradex" name="toradex-github"/> + <remote fetch="git://source.codeaurora.org/external/imx" name="aurora-imx"/> <project name="poky" remote="yocto" @@ -37,12 +38,12 @@ remote="freescale" revision="27ca94f8a4336790ba117b4298566f6820e7e74c" path="sources/meta-freescale" - groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8"/> + groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8,toradex-imx8"/> <project name="meta-freescale-3rdparty" remote="freescale" revision="82037216280a39957fb4272581637abec734ad50" path="sources/meta-freescale-3rdparty" - groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8"/> + groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8,toradex-imx8"/> <project name="meta-raspberrypi" remote="yocto" revision="2d40b000021bc8a9ef7f329ed0ad410f8d227b97" @@ -89,10 +90,15 @@ path="sources/meta-boundary" groups="notdefault,external,boundary"/> <project name="meta-fsl-bsp-release" - remote="toradex-github" - revision="28c1b2adfb6445a64a42d082299203ec2035ea9f" + remote="aurora-imx" + revision="cb65aa03c70d0b88cdc2b06eb56ab59ae01f54bf" path="sources/meta-fsl-bsp-release" groups="notdefault,external,fsl-imx8"/> + <project name="meta-fsl-bsp-release" + remote="toradex-github" + revision="55754a3cc79759f18fa1df88ae2ffa91fbd87d84" + path="sources/meta-fsl-bsp-release-toradex" + groups="notdefault,external,toradex-imx8"/> <project name="nvidia-layer" remote="playground" diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index febda41f..c4f6a3d7 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh @@ -56,9 +56,12 @@ BUILDDIRECTORY=${BUILDDIRECTORY:-build-${MACHINE}} if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then case ${MACHINE} in - apalis-imx8|imx8qmlpddr4arm2) + imx8qmmek|imx8mqevk) LAYERSCONF="bblayers.conf.fsl-imx8.sample" ;; + apalis-imx8|colibri-imx8qxp) + LAYERSCONF="bblayers.conf.toradex-imx8.sample" + ;; apalis-imx6|colibri-imx6|colibri-imx6ull|colibri-vf|colibri-imx7|colibri-imx7-emmc) LAYERSCONF="bblayers.conf.toradex.sample" ;; |