brcmfmac_sdio-firmware-rpi: fix udev rule

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() {

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

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 '\
+KERNEL=="ttyAMA[01]", PROGRAM="/usr/bin/rpi-udev 0", SYMLINK+="serial%c"
-        ALIASES=/proc/device-tree/aliases; \
+KERNEL=="ttyS0", PROGRAM="/usr/bin/rpi-udev 1", SYMLINK+="serial%c"
-        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"