diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-09-15 09:58:16 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-09-15 13:34:28 +0300 |
| commit | 7faffd0a1f4800c50547c1aefddeb5db006b267f (patch) | |
| tree | 6a08a1941ba85a6c1e870a30a291bcf669cb6b09 /meta-toradex-extras | |
| parent | cf56c7b6c15597c0d04a33204ba25ec37c4667f3 (diff) | |
| parent | b54b20eb868b68379c792efab0baf8a15cd8a283 (diff) | |
Merge remote-tracking branch 'origin/dizzy' into dev
openssl/c_rehash patch updated to apply again.
* origin/dizzy:
Fix c_rehash run during image creation
Include CDC-ACM kernel module
Use mirror from github to clone git-repo tool
Add libevent to toolchain and image
Use correct path for mkspecs
qt5: remove separate designer packages
qt5: use 5.5-next branch for meta-qt5
qt5: patch qdevice.conf from correct location
Change-Id: I6998da6dc050c17aa1cbf20d50bcf0d14fc4ee8e
Diffstat (limited to 'meta-toradex-extras')
| -rw-r--r-- | meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend | 1 | ||||
| -rw-r--r-- | meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend index 1e2b5f3c..3f07de3a 100644 --- a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend +++ b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend @@ -32,6 +32,7 @@ RDEPENDS_kernel-base = "" config_script () { # FunctionFS for adb echo "CONFIG_USB_FUNCTIONFS=m" >> ${S}/.config + echo "CONFIG_USB_ACM=m" >> ${S}/.config } B = "${S}" diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend index 76bf87dd..fd9ad55f 100644 --- a/meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend +++ b/meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend @@ -29,5 +29,6 @@ SRC_URI += " \ do_configure_prepend () { # FunctionFS for adb echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_ACM=m" >> ${WORKDIR}/defconfig echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig } |