From 238072cb55009480c5170a9952d5ee1e83a74473 Mon Sep 17 00:00:00 2001 From: Eddi De Pieri Date: Sun, 21 Jan 2018 00:36:55 +0100 Subject: [PATCH] fix bt on orangepiwin --- packages/bsp/common/etc/init.d/firstrun | 4 ++-- packages/extras/tools/brcm40183-patch | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/packages/bsp/common/etc/init.d/firstrun b/packages/bsp/common/etc/init.d/firstrun index 4129107744..1c4daa07b0 100755 --- a/packages/bsp/common/etc/init.d/firstrun +++ b/packages/bsp/common/etc/init.d/firstrun @@ -36,10 +36,10 @@ case "$1" in # BT tweaks case ${BOARD} in - cubietruck) + cubietruck|orangepiwin) systemctl enable brcm40183-patch && service brcm40183-patch start ;; - bananapim2plus|nanopiair|nanopim1plus|orangepizeroplus2*|orangepiwin|nanopineoplus2|nanopik2) + bananapim2plus|nanopiair|nanopim1plus|orangepizeroplus2*|nanopineoplus2|nanopik2) update-rc.d ap6212-bluetooth defaults ;; cubox-i) diff --git a/packages/extras/tools/brcm40183-patch b/packages/extras/tools/brcm40183-patch index 33c853771e..23abf9984a 100644 --- a/packages/extras/tools/brcm40183-patch +++ b/packages/extras/tools/brcm40183-patch @@ -21,6 +21,7 @@ fi # exit if bluetooth utils are not installed [ -f "/bin/hciconfig" ] || exit 0 +. /etc/armbian-release . /lib/lsb/init-functions do_start () { @@ -45,8 +46,16 @@ else PORT="ttyS1" fi + case ${BOARD} in + "orangepiwin") + PATCHRAM="/lib/firmware/ap6212/bcm43438a1.hcd" + ;; + *) + PATCHRAM="/lib/firmware/ap6210/bcm20710a1.hcd" # Different port for mainline if [ `uname -r | grep -v '^3.4.' ` ]; then PORT="ttyS2"; fi + ;; + esac # reset port /usr/bin/brcm_bt_reset /dev/$PORT @@ -55,7 +64,7 @@ else /bin/echo -en "" > /dev/$PORT # pull down RTS on UART log_action_begin_msg "Start pushing firmware to device and waiting max. 60sec to complete" - /usr/bin/timeout 20s /usr/bin/brcm_patchram_plus -d --patchram /lib/firmware/ap6210/bcm20710a1.hcd --enable_hci --no2bytes --tosleep 1000 $MAC_OPTIONS /dev/$PORT > /tmp/brcm40183.firmware 2>&1 + /usr/bin/timeout 20s /usr/bin/brcm_patchram_plus -d --patchram $PATCHRAM -enable_hci --no2bytes --tosleep 1000 $MAC_OPTIONS /dev/$PORT > /tmp/brcm40183.firmware 2>&1 case "$?" in 0) log_action_end_msg 0