diff options
| author |   Walt Miner <wminer@linuxfoundation.org> | 2015-10-26 12:56:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.200> | 2015-10-26 12:56:59 +0000 |
| commit | 437bea51272f8b27de9df7d577818ef4e95a8c65 (patch) | |
| tree | 548dda1dd2d2fce07ab0db7afdcd55e827329df3 | |
| parent | 8901cab884f9e4431781ca42291579cffc092b47 (diff) | |
| parent | e232b907c1da205da7d603a68c597b70689b0b05 (diff) | |
Merge "r-car m2: support Bluetooth hardware" into agl-1.0-bsp-1.8.0
| -rw-r--r-- | meta-rcar-gen2/conf/local.conf.sample | 13 | ||||
| -rw-r--r-- | meta-rcar-gen2/recipes-kernel/linux/linux.inc | 17 |
2 files changed, 30 insertions, 0 deletions
diff --git a/meta-rcar-gen2/conf/local.conf.sample b/meta-rcar-gen2/conf/local.conf.sample index 43857ba..76c15e2 100644 --- a/meta-rcar-gen2/conf/local.conf.sample +++ b/meta-rcar-gen2/conf/local.conf.sample @@ -48,6 +48,19 @@ MACHINE = "porter" # alsa-utils alsa-tools \ #" +# For Bluetooth hardware support +BT_KERNEL_MODULES = " \ + kernel-module-btusb \ + kernel-module-bnep \ + kernel-module-rfcomm \ + kernel-module-rfkill \ + " + +# Distribution-specific runtime components +IMAGE_INSTALL_append = " \ + ${@bb.utils.contains("DISTRO_FEATURES", "bluetooth", "${BT_KERNEL_MODULES}", "", d)} \ + " + # TODO: When booting weston, someone try to load 'libgbm_kms.so' then # fail to boot. It should be 'libgbm_kms.so.1'. # Tentatively, it is to install 'libgbm-dev' pkg. diff --git a/meta-rcar-gen2/recipes-kernel/linux/linux.inc b/meta-rcar-gen2/recipes-kernel/linux/linux.inc index 5a784c5..a057745 100644 --- a/meta-rcar-gen2/recipes-kernel/linux/linux.inc +++ b/meta-rcar-gen2/recipes-kernel/linux/linux.inc @@ -59,6 +59,11 @@ do_configure_prepend() { kernel_configure_variable LOCALVERSION "\"\"" kernel_configure_variable LOCALVERSION_AUTO n + # Distribution-dependent kernel features + case "${DISTRO_FEATURES}" in + *bluetooth*) do_configure_bluetooth + esac + # Udev quirks # Newer versions of udev mandate that sysfs doesn't have deprecated entries if [ "${UDEV_GE_141}" = "1" ] ; then @@ -132,6 +137,18 @@ do_configure_prepend() { yes '' | oe_runmake oldconfig } +do_configure_bluetooth() { + # Needed for Bluetooth hardware support + kernel_configure_variable BT_HIDP y + kernel_configure_variable BT_HCIBTUSB m + kernel_configure_variable BT_BNEP m + kernel_configure_variable BT_BNEP_MC_FILTER y + kernel_configure_variable BT_BNEP_PROTO_FILTER y + kernel_configure_variable BT_RFCOMM m + kernel_configure_variable BT_RFCOMM_TTY y + kernel_configure_variable RFKILL m +} + do_configure_append_porter() { # Enable CAN kernel_configure_variable CAN y |