diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-08-26 11:21:40 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-08-26 11:21:44 +0300 |
| commit | 925af8ef05293e550f8fa8586ef3549e913b690c (patch) | |
| tree | f1ac7c009711bb7afe7e338dfb33d2db048d98e7 /scripts | |
| parent | 0f231fb1eb7b24f4a839106dc22ea472e6bc8eb4 (diff) | |
| parent | 36529af42c25c3e14aa0918a6012f336151f9c2a (diff) | |
| download | meta-boot2qt-925af8ef05293e550f8fa8586ef3549e913b690c.tar.gz | |
Merge remote-tracking branch 'origin/dizzy' into dev
* origin/dizzy:
Add atk and atk-dev packages
ca-certificates: update to latest version
Add touch_frame events to Weston 1.5.0
kontron: Add support for Kontron SMARC-sARX6i
bootfs: make sure deploy dir exists before using it
Change-Id: I5c58c6ad47c0689c15e71948a486530f5504b329
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 ce593c6..683f19f 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh | |||
| @@ -52,7 +52,7 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then | |||
| 52 | apalis-imx6|colibri-imx6|colibri-vf) | 52 | apalis-imx6|colibri-imx6|colibri-vf) |
| 53 | LAYERSCONF="bblayers.conf.toradex.sample" | 53 | LAYERSCONF="bblayers.conf.toradex.sample" |
| 54 | ;; | 54 | ;; |
| 55 | imx53qsb|imx6qsabresd|imx6dlsabresd|nitrogen6x) | 55 | imx53qsb|imx6qsabresd|imx6dlsabresd|nitrogen6x|smarc-samx6i) |
| 56 | LAYERSCONF="bblayers.conf.fsl.sample" | 56 | LAYERSCONF="bblayers.conf.fsl.sample" |
| 57 | ;; | 57 | ;; |
| 58 | tibidabo) | 58 | tibidabo) |