diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2019-09-10 12:04:10 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-09-10 12:04:10 +0300 |
| commit | 16351237e2a7d94155a5e2e3ce1e055893ed816d (patch) | |
| tree | ec21ffd42548ff0e555c8bf87cbfb352fe6d4246 /scripts | |
| parent | c3d680bf64c4747b22af526acbf121c1ee6044e6 (diff) | |
| parent | a0b92009f8b7cd7516c88a9b0cfde244aea55bf5 (diff) | |
Merge remote-tracking branch 'origin/QtAS-5.12.4' into sumo
* origin/QtAS-5.12.4:
Update automotive sha1s in QtAS-5.12.4 branch
Update automotive sha1s in QtAS-5.12.4 branch
Update automotive sha1s in QtAS-5.12.4 branch
Add config for NXP i.MX8QXP
Change-Id: Ie774e592b1c5d46d51ff116d5d6397ada9f6f6a1
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/setup-environment.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index c4f6a3d7..05e70159 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 - imx8qmmek|imx8mqevk) + imx8*) LAYERSCONF="bblayers.conf.fsl-imx8.sample" ;; apalis-imx8|colibri-imx8qxp) |