diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2019-06-03 12:25:34 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-06-03 12:27:00 +0300 |
| commit | fa4c42d18addc6f135fe05090eaed8b84f74555c (patch) | |
| tree | c971f4fed65f34950bf7e87de85ffa23a040b161 /scripts | |
| parent | 92017b534255fbd0285674c1dbde3564fdd8b1f6 (diff) | |
| parent | 51252fb338be0e1e445aa1f3cad754dd3aea14bc (diff) | |
Merge remote-tracking branch 'origin/sumo' into thud
* origin/sumo:
qtdeviceutilities: update to latest revision
renesas: update webengine workaround
gammaray: update revision
imx8: update meta layer
meta-qt5: update layer
meta-intel: update layer
Change-Id: I0d49cda55869c8848559b2250561a5101937b71d
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 0916bef7..9eff69d4 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="9d1463c9af81edadf8c5a343a030555b6156f8cf" 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="47848bff9478999019947f69a719b3d2c2a6b558" 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="a48743dc36e31170cf737e200cc88f273e13611a" @@ -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" ;; |