From e61ec397f1dcb85888ba9f248b5886f0a6c7ba4f Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Tue, 24 Sep 2019 13:59:23 +0100
Subject: [PATCH] brcmfmac_sdio-firmware-rpi: fix udev rule

---
 .../brcmfmac_sdio-firmware-rpi/package.mk     |  1 +
 .../scripts/rpi-udev                          | 12 ++++++++++
 .../udev.d/90-rpi-add-serial.rules            | 23 ++-----------------
 3 files changed, 15 insertions(+), 21 deletions(-)
 create mode 100755 packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-udev

diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk
index e02adc11cb..16dc8346ab 100644
--- a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk
+++ b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk
@@ -20,6 +20,7 @@ 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() {
diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-udev b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-udev
new file mode 100755
index 0000000000..43a8a0a4af
--- /dev/null
+++ b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-udev
@@ -0,0 +1,12 @@
+#!/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/udev.d/90-rpi-add-serial.rules b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/udev.d/90-rpi-add-serial.rules
index 334bd37d4b..a189a00267 100644
--- 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
@@ -1,21 +1,2 @@
-KERNEL=="ttyAMA[01]", PROGRAM="/bin/sh -c '\
-        ALIASES=/proc/device-tree/aliases; \
-        if [ $(cat $ALIASES/uart0) = $(cat $ALIASES/serial0) ]; then \
-            echo 0;\
-        elif [ $(cat $ALIASES/uart0) = $(cat $ALIASES/serial1) ]; then \
-            echo 1; \
-        else \
-            exit 1; \
-        fi\
-    '", SYMLINK+="serial%c"
-
-KERNEL=="ttyS0", PROGRAM="/bin/sh -c '\
-        ALIASES=/proc/device-tree/aliases; \
-        if [ $(cat $ALIASES/uart1) = $(cat $ALIASES/serial0) ]; then \
-            echo 0; \
-        elif [ $(cat $ALIASES/uart1) = $(cat $ALIASES/serial1) ]; then \
-            echo 1; \
-        else \
-            exit 1; \
-        fi \
-    '", SYMLINK+="serial%c"
+KERNEL=="ttyAMA[01]", PROGRAM="/usr/bin/rpi-udev 0", SYMLINK+="serial%c"
+KERNEL=="ttyS0", PROGRAM="/usr/bin/rpi-udev 1", SYMLINK+="serial%c"