summaryrefslogtreecommitdiffstats
path: root/meta-fsl-extras
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2017-04-12 09:47:38 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2017-04-13 08:58:03 +0300
commit0be3cf9ea04a306f076ce4e4cb6cd06263e88c48 (patch)
tree382563b41a9a8a47dc62f69e9bef343e0b5e9293 /meta-fsl-extras
parentdd6b12f58b505b42729c70f54b5a300f2f840e9e (diff)
parent09aff0bac92e648856d3eee80479c876a3e0fab7 (diff)
downloadmeta-boot2qt-0be3cf9ea04a306f076ce4e4cb6cd06263e88c48.tar.gz
Merge remote-tracking branch 'origin/krogoth' into dev
* origin/krogoth: neptune-ui: update revision neptune-ui: depends on qttools-native Multiscreen-demo: update revision neptune-ui: rdepends on dbus-session multiscreen-demo: update revision qtivi: Update to the latest version neptune-ui: Update to the latest version neptune: update to latest version toradex: add missing USB kernel config for colibri vf Change-Id: Ic0ae906b9acef6a09c80ee50ea7b56d558636739
Diffstat (limited to 'meta-fsl-extras')
-rw-r--r--meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
index 5a92f25..5830238 100644
--- a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
@@ -34,4 +34,7 @@ do_preconfigure_prepend () {
34 echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig 34 echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig
35 echo "CONFIG_USB_ACM=m" >> ${WORKDIR}/defconfig 35 echo "CONFIG_USB_ACM=m" >> ${WORKDIR}/defconfig
36 echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig 36 echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig
37
38 echo "CONFIG_EXTCON=y" >> ${WORKDIR}/defconfig
39 echo "CONFIG_EXTCON_USB_GPIO=y" >> ${WORKDIR}/defconfig
37} 40}