bluez5: use pi-bluetooth package for startup infrastructure

RPi-Distro has augmented their bluetooth infrastructure to support new
features.  It also correctly handles restart, which fixes problems when
faults cause hciattach to exit.  Replace brcm43438.service with the
upstream ones.

Resolves: #330
Signed-off-by: Peter A. Bigot <pab@pabigot.com>
This commit is contained in:
Peter A. Bigot
2018-11-14 07:48:51 -06:00
committed by Andrei Gherzan
parent bfc35b773f
commit f752e92383
4 changed files with 60 additions and 51 deletions

View File

@@ -1,14 +0,0 @@
[Unit]
Description=Broadcom BCM43438 bluetooth HCI
ConditionPathIsDirectory=/proc/device-tree/soc/gpio@7e200000/bt_pins
Before=bluetooth.service
BindsTo=dev-serial1.device
After=dev-serial1.device
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/usr/bin/btuart
[Install]
WantedBy=multi-user.target

View File

@@ -5,41 +5,12 @@ BCM_BT_SOURCES = " \
file://0002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch \
file://0003-Increase-firmware-load-timeout-to-30s.patch \
file://0004-Move-the-43xx-firmware-into-lib-firmware.patch \
file://brcm43438.service \
"
BCM_BT_SERVICE = "brcm43438.service"
enable_bcm_bluetooth() {
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
install -d ${D}${systemd_unitdir}/system
install -m 0644 ${WORKDIR}/${BCM_BT_SERVICE} ${D}${systemd_unitdir}/system
fi
}
BCM_BT_RDEPENDS = "\
udev-rules-rpi \
pi-bluetooth \
"
# for raspberrypi3
BCM_BT_RDEPENDS = "pi-bluetooth"
SRC_URI_append_raspberrypi0-wifi = " ${BCM_BT_SOURCES}"
SRC_URI_append_raspberrypi3 = " ${BCM_BT_SOURCES}"
do_install_append_raspberrypi3() {
enable_bcm_bluetooth
}
SYSTEMD_SERVICE_${PN}_append_raspberrypi3 = " ${BCM_BT_SERVICE}"
RDEPENDS_${PN}_append_raspberrypi3 = " ${BCM_BT_RDEPENDS}"
# for raspberrypi0-wifi
SRC_URI_append_raspberrypi0-wifi = " ${BCM_BT_SOURCES}"
do_install_append_raspberrypi0-wifi() {
enable_bcm_bluetooth
}
SYSTEMD_SERVICE_${PN}_append_raspberrypi0-wifi = " ${BCM_BT_SERVICE}"
RDEPENDS_${PN}_append_raspberrypi0-wifi = " ${BCM_BT_RDEPENDS}"
RDEPENDS_${PN}_append_raspberrypi3 = " ${BCM_BT_RDEPENDS}"