From c458a2fe4001894a9789117b82d4526fbd01f7f7 Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Sat, 6 May 2023 12:13:49 +0200
Subject: [PATCH] brcmfmac_sdio-firmware-rpi: drop rpi-btuart script and
 service

Bluetooth is finally initialized by the kernel

Signed-off-by: Matthias Reichl <hias@horus.com>
---
 .../brcmfmac_sdio-firmware-rpi/package.mk     | 11 --------
 .../scripts/rpi-btuart                        | 26 -------------------
 .../scripts/rpi-udev                          | 12 ---------
 .../system.d/brcmfmac_sdio-firmware.service   | 13 ----------
 .../udev.d/90-rpi-add-serial.rules            |  2 --
 5 files changed, 64 deletions(-)
 delete mode 100755 packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-btuart
 delete mode 100755 packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-udev
 delete mode 100644 packages/linux-firmware/brcmfmac_sdio-firmware-rpi/system.d/brcmfmac_sdio-firmware.service
 delete mode 100644 packages/linux-firmware/brcmfmac_sdio-firmware-rpi/udev.d/90-rpi-add-serial.rules

diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk
index 10eb23f6d3..0f52d0b8ce 100644
--- a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk
+++ b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk
@@ -15,14 +15,3 @@ PKG_TOOLCHAIN="manual"
 makeinstall_target() {
   DESTDIR=${INSTALL}/$(get_kernel_overlay_dir) ./install
 }
-
-post_makeinstall_target() {
-  # Install rpi btuart script to bring up Bluetooth
-  mkdir -p ${INSTALL}/usr/bin
-    cp -P ${PKG_DIR}/scripts/rpi-btuart ${INSTALL}/usr/bin
-    cp -P ${PKG_DIR}/scripts/rpi-udev ${INSTALL}/usr/bin
-}
-
-post_install() {
-  enable_service brcmfmac_sdio-firmware.service
-}
diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-btuart b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-btuart
deleted file mode 100755
index b9c6cee09d..0000000000
--- a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-btuart
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-HCIATTACH=/usr/bin/hciattach
-if grep -q "Pi 4" /proc/device-tree/model; then
-  BDADDR=
-else
-  SERIAL=$(cat /proc/device-tree/serial-number | cut -c9-)
-  B1=${SERIAL:2:2}
-  B2=${SERIAL:4:2}
-  B3=${SERIAL:6:2}
-  BDADDR=$(printf b8:27:eb:%02x:%02x:%02x $((0x$B1 ^ 0xaa)) $((0x$B2 ^ 0xaa)) $((0x$B3 ^ 0xaa)))
-fi
-
-uart0="$(cat /proc/device-tree/aliases/uart0)"
-serial1="$(cat /proc/device-tree/aliases/serial1)"
-
-if [ "$uart0" = "$serial1" ] ; then
-  uart0_pins="$(wc -c /proc/device-tree/soc/gpio@7e200000/uart0_pins/brcm\,pins | cut -f 1 -d ' ')"
-  if [ "$uart0_pins" = "16" ] ; then
-    $HCIATTACH /dev/serial1 bcm43xx 3000000 flow - $BDADDR
-  else
-    $HCIATTACH /dev/serial1 bcm43xx 921600 noflow - $BDADDR
-  fi
-else
-  $HCIATTACH /dev/serial1 bcm43xx 460800 noflow - $BDADDR
-fi
diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-udev b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-udev
deleted file mode 100755
index 43a8a0a4af..0000000000
--- a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-udev
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-ALIASES="/proc/device-tree/aliases"
-UARTX="uart${1}"
-
-if [ $(cat ${ALIASES}/${UARTX}) = $(cat ${ALIASES}/serial0) ]; then
-  echo 0
-elif [ $(cat ${ALIASES}/${UARTX}) = $(cat ${ALIASES}/serial1) ]; then
-  echo 1
-else
-  exit 1
-fi
diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/system.d/brcmfmac_sdio-firmware.service b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/system.d/brcmfmac_sdio-firmware.service
deleted file mode 100644
index 97809c744e..0000000000
--- a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/system.d/brcmfmac_sdio-firmware.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Broadcom sdio firmware update for BCM43430A1
-ConditionFileNotEmpty=/proc/device-tree/soc/gpio@7e200000/bt_pins/brcm,pins
-Requires=dev-serial1.device
-After=dev-serial1.device network.target
-
-[Service]
-Type=simple
-RemainAfterExit=yes
-ExecStart=/usr/bin/rpi-btuart
-
-[Install]
-WantedBy=network.target
diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/udev.d/90-rpi-add-serial.rules b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/udev.d/90-rpi-add-serial.rules
deleted file mode 100644
index a189a00267..0000000000
--- a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/udev.d/90-rpi-add-serial.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-KERNEL=="ttyAMA[01]", PROGRAM="/usr/bin/rpi-udev 0", SYMLINK+="serial%c"
-KERNEL=="ttyS0", PROGRAM="/usr/bin/rpi-udev 1", SYMLINK+="serial%c"