diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-05-11 13:45:27 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-05-11 13:46:12 +0300 |
| commit | 18624c58085917b1f5828e4270609fa19c36e6dd (patch) | |
| tree | 2d0bbae6f0a0552ad5ac76ed776501a9f6998a6f | |
| parent | c544dcac30350e62c3d49e60ab4c17522ce255fc (diff) | |
| parent | aff8d4a2ad616a50ae899118224a08c38b1774a6 (diff) | |
| download | meta-boot2qt-18624c58085917b1f5828e4270609fa19c36e6dd.tar.gz | |
Merge remote-tracking branch 'origin/krogoth' into morty
* origin/krogoth:
NUC: add support for multitouch displays
Change-Id: I39cecf0afbdf9f6d7a23353e6bb2a14aa28e79dc
| -rw-r--r-- | meta-intel-extras/recipes/linux/linux-yocto/b2qt.cfg | 1 | ||||
| -rw-r--r-- | meta-intel-extras/recipes/linux/linux-yocto_4.%.bbappend | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/meta-intel-extras/recipes/linux/linux-yocto/b2qt.cfg b/meta-intel-extras/recipes/linux/linux-yocto/b2qt.cfg new file mode 100644 index 0000000..7902798 --- /dev/null +++ b/meta-intel-extras/recipes/linux/linux-yocto/b2qt.cfg | |||
| @@ -0,0 +1 @@ | |||
| CONFIG_HID_MULTITOUCH=m | |||
diff --git a/meta-intel-extras/recipes/linux/linux-yocto_4.%.bbappend b/meta-intel-extras/recipes/linux/linux-yocto_4.%.bbappend index 2879e65..a61cf4d 100644 --- a/meta-intel-extras/recipes/linux/linux-yocto_4.%.bbappend +++ b/meta-intel-extras/recipes/linux/linux-yocto_4.%.bbappend | |||
| @@ -30,4 +30,5 @@ | |||
| 30 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 30 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
| 31 | SRC_URI += "\ | 31 | SRC_URI += "\ |
| 32 | file://wlan-realtek.cfg \ | 32 | file://wlan-realtek.cfg \ |
| 33 | file://b2qt.cfg \ | ||
| 33 | " | 34 | " |