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-fsl-extras | |
parent | cf56c7b6c15597c0d04a33204ba25ec37c4667f3 (diff) | |
parent | b54b20eb868b68379c792efab0baf8a15cd8a283 (diff) | |
download | meta-boot2qt-7faffd0a1f4800c50547c1aefddeb5db006b267f.tar.gz |
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-fsl-extras')
-rw-r--r-- | meta-fsl-extras/recipes/linux/linux-boundary_3.10.%.bbappend | 2 | ||||
-rw-r--r-- | meta-fsl-extras/recipes/linux/linux-imx_3.14.%.bbappend | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.%.bbappend b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.%.bbappend index 1d7f942..c25739b 100644 --- a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.%.bbappend +++ b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.%.bbappend | |||
@@ -45,4 +45,6 @@ do_configure_prepend() { | |||
45 | # enable uvcvideo module | 45 | # enable uvcvideo module |
46 | echo "CONFIG_MEDIA_USB_SUPPORT=y" >> ${WORKDIR}/defconfig | 46 | echo "CONFIG_MEDIA_USB_SUPPORT=y" >> ${WORKDIR}/defconfig |
47 | echo "CONFIG_USB_VIDEO_CLASS=m" >> ${WORKDIR}/defconfig | 47 | echo "CONFIG_USB_VIDEO_CLASS=m" >> ${WORKDIR}/defconfig |
48 | |||
49 | echo "CONFIG_USB_ACM=m" >> ${WORKDIR}/defconfig | ||
48 | } | 50 | } |
diff --git a/meta-fsl-extras/recipes/linux/linux-imx_3.14.%.bbappend b/meta-fsl-extras/recipes/linux/linux-imx_3.14.%.bbappend index e12bde0..602c3df 100644 --- a/meta-fsl-extras/recipes/linux/linux-imx_3.14.%.bbappend +++ b/meta-fsl-extras/recipes/linux/linux-imx_3.14.%.bbappend | |||
@@ -32,4 +32,5 @@ do_configure_prepend() { | |||
32 | echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${WORKDIR}/defconfig | 32 | echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${WORKDIR}/defconfig |
33 | echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${WORKDIR}/defconfig | 33 | echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${WORKDIR}/defconfig |
34 | echo "CONFIG_USB_SERIAL_PL2303=m" >> ${WORKDIR}/defconfig | 34 | echo "CONFIG_USB_SERIAL_PL2303=m" >> ${WORKDIR}/defconfig |
35 | echo "CONFIG_USB_ACM=m" >> ${WORKDIR}/defconfig | ||
35 | } | 36 | } |