Revert "fix bt on orangepiwin"

This reverts commit 238072cb55.
This commit is contained in:
Eddi De Pieri 2018-01-27 10:04:23 +01:00
parent 0cdc3b8130
commit 6e79dc833d
2 changed files with 3 additions and 12 deletions

View File

@ -36,10 +36,10 @@ case "$1" in
# BT tweaks
case ${BOARD} in
cubietruck|orangepiwin)
cubietruck)
systemctl enable brcm40183-patch && service brcm40183-patch start
;;
bananapim2plus|nanopiair|nanopim1plus|orangepizeroplus2*|nanopineoplus2|nanopik2)
bananapim2plus|nanopiair|nanopim1plus|orangepizeroplus2*|orangepiwin|nanopineoplus2|nanopik2)
update-rc.d ap6212-bluetooth defaults
;;
cubox-i)

View File

@ -21,7 +21,6 @@ fi
# exit if bluetooth utils are not installed
[ -f "/bin/hciconfig" ] || exit 0
. /etc/armbian-release
. /lib/lsb/init-functions
do_start () {
@ -46,16 +45,8 @@ 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
@ -64,7 +55,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 $PATCHRAM -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 /lib/firmware/ap6210/bcm20710a1.hcd --enable_hci --no2bytes --tosleep 1000 $MAC_OPTIONS /dev/$PORT > /tmp/brcm40183.firmware 2>&1
case "$?" in
0) log_action_end_msg 0