From a84c69ddea886172b7aa876793dc561487c2e538 Mon Sep 17 00:00:00 2001 From: Piotr Szczepanik Date: Sun, 20 Dec 2020 23:45:30 +0100 Subject: [PATCH] Fix boot (and bluetooth) for NanoPi M4*, NanoPC T4 and Firefly RK3399 in legacy (#2480) * Fix boot (and bluetooth) for NanoPi M4*, NanoPC T4 and Firefly-RK3399 in legacy * Changed rk3399-bluetooth service type to exec --- config/sources/families/include/rockchip64_common.inc | 3 +++ packages/bsp/rk3399/rk3399-bluetooth.service | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc index 9da339a8d1..52db644408 100644 --- a/config/sources/families/include/rockchip64_common.inc +++ b/config/sources/families/include/rockchip64_common.inc @@ -345,6 +345,9 @@ family_tweaks_bsp() install -m 755 $SRC/packages/bsp/rk3399/brcm_patchram_plus_rk3399 $destination/usr/bin cp $SRC/packages/bsp/rk3399/rk3399-bluetooth.service $destination/lib/systemd/system/ + if [[ $BOARD == nanop*4* || $BOARD == firefly* ]]; then + sed -i s%BCM4345C5%BCM4356A2%g $destination/lib/systemd/system/rk3399-bluetooth.service + fi fi if [[ $BOARD == pinebook-pro ]]; then diff --git a/packages/bsp/rk3399/rk3399-bluetooth.service b/packages/bsp/rk3399/rk3399-bluetooth.service index 56c03af851..aa7129e739 100644 --- a/packages/bsp/rk3399/rk3399-bluetooth.service +++ b/packages/bsp/rk3399/rk3399-bluetooth.service @@ -3,9 +3,9 @@ Description=Bluetooth Rockpi After=bluetooth.target [Service] -Type=forking +Type=exec ExecStartPre=/usr/sbin/rfkill unblock all -ExecStart=/usr/bin/brcm_patchram_plus_rk3399 -d --enable_hci --no2bytes --use_baudrate_for_downloade --tosleep 200000 --baudrate 1500000 --patchram /lib/firmware/brcm/BCM4345C5.hcd /dev/ttyS0 +ExecStart=/usr/bin/brcm_patchram_plus_rk3399 -d --enable_hci --no2bytes --use_baudrate_for_download --tosleep 200000 --baudrate 1500000 --patchram /lib/firmware/brcm/BCM4345C5.hcd /dev/ttyS0 TimeoutSec=0 RemainAfterExit=yes SysVStartPriority=99