diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-05-04 16:15:02 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-05-04 16:15:02 +0300 |
| commit | 51a55da41a8cdd4f637a6c6cd44e1ac2ba74ae32 (patch) | |
| tree | b57ff35bf91a67fc0d6c3eb7831ed82f5f575c47 /conf | |
| parent | 61d552148d797866ed33a9cd5e56477873cf801d (diff) | |
| parent | e3ef984ac6f5926d7a910eff33bafeb5da6c2ff0 (diff) | |
| download | meta-boot2qt-51a55da41a8cdd4f637a6c6cd44e1ac2ba74ae32.tar.gz | |
Merge remote-tracking branch 'origin/fido' into dev
* origin/fido:
automotive: update src uris after repos were opened
colibri-vf: change partition alignment to 1M
Make ABI selection more robust in configure-qtcreator.sh
Conflicts:
recipes-qt/automotive/neptune-ui_git.bb
recipes-qt/automotive/qtapplicationmanager_git.bb
recipes-qt/automotive/qtivi_git.bb
Change-Id: I86763619f24b40e9ac62a8c1ae84acf4ffeb4be7
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/colibri-vf.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf index 0d31f99..6512f2b 100644 --- a/conf/distro/include/colibri-vf.conf +++ b/conf/distro/include/colibri-vf.conf | |||
| @@ -24,6 +24,7 @@ include conf/distro/include/toradex.inc | |||
| 24 | DEPLOY_CONF_NAME = "Toradex Colibri VF" | 24 | DEPLOY_CONF_NAME = "Toradex Colibri VF" |
| 25 | 25 | ||
| 26 | IMAGE_FSTYPES += "ext3 sdcard" | 26 | IMAGE_FSTYPES += "ext3 sdcard" |
| 27 | IMAGE_ROOTFS_ALIGNMENT_colibri-vf = "1024" | ||
| 27 | 28 | ||
| 28 | BOOTFS_CONTENT = "\ | 29 | BOOTFS_CONTENT = "\ |
| 29 | u-boot-${MACHINE}.imx:u-boot.imx \ | 30 | u-boot-${MACHINE}.imx:u-boot.imx \ |