From 3a0c93131a919083245ab09fc20971740d2aca30 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 25 Aug 2017 18:10:04 +0100 Subject: [PATCH 1/4] brcmfmac_sdio-firmware-rpi: update to brcmfmac_sdio-firmware-rpi-0.2 --- packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk index ecaa46340b..1399c35b99 100644 --- a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk +++ b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="brcmfmac_sdio-firmware-rpi" -PKG_VERSION="0.1" +PKG_VERSION="0.2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/LibreELEC/LibreELEC.tv" From 97c0cbed2c3f6297a0b526dbac26868e9179a2fa Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 25 Aug 2017 18:15:00 +0100 Subject: [PATCH 2/4] kernel-firmware: don't install brcmfmac43430-sdio.bin --- packages/linux-firmware/kernel-firmware/package.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/linux-firmware/kernel-firmware/package.mk b/packages/linux-firmware/kernel-firmware/package.mk index eced7683c7..1ab715b128 100644 --- a/packages/linux-firmware/kernel-firmware/package.mk +++ b/packages/linux-firmware/kernel-firmware/package.mk @@ -67,4 +67,7 @@ makeinstall_target() { done done < ${fwlist} done + + # The following file is installed by brcmfmac_sdio-firmware-rpi + rm -fr $FW_TARGET_DIR/brcm/brcmfmac43430-sdio.bin } From c166bcea32df22a68aebddae6894caa61b4f1114 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 25 Aug 2017 18:17:03 +0100 Subject: [PATCH 3/4] wlan-firmware: update to wlan-firmware-34a47d9 --- packages/linux-firmware/wlan-firmware/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux-firmware/wlan-firmware/package.mk b/packages/linux-firmware/wlan-firmware/package.mk index 9db1a4591f..040b375594 100644 --- a/packages/linux-firmware/wlan-firmware/package.mk +++ b/packages/linux-firmware/wlan-firmware/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="wlan-firmware" -PKG_VERSION="25d0c93" +PKG_VERSION="34a47d9" PKG_ARCH="any" PKG_LICENSE="Free-to-use" PKG_SITE="https://github.com/LibreELEC/wlan-firmware" From ee7da2fcf6f4c31237f5bc9df0a3752036ea28c1 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 23 Aug 2017 16:36:44 +0100 Subject: [PATCH 4/4] brcmfmac_sdio-firmware-rpi: set BT MAC as new firmware uses a fixed MAC See: https://github.com/raspberrypi/firmware/issues/860#issuecomment-324355290 Also, use sh instead of bash - one less unecessary bash dependency. --- .../brcmfmac_sdio-firmware-rpi/scripts/rpi-btuart | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-btuart b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-btuart index c27c58c152..fb89ef84e6 100755 --- a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-btuart +++ b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-btuart @@ -1,11 +1,18 @@ -#!/bin/bash +#!/bin/sh + +HCIATTACH=/usr/bin/hciattach +SERIAL=$(awk '/^Serial/{ print $3 }' /proc/cpuinfo) +B1=${SERIAL:10:2} +B2=${SERIAL:12:2} +B3=${SERIAL:14:2} +BDADDR=$(printf b8:27:eb:%02x:%02x:%02x $((0x$B1 ^ 0xaa)) $((0x$B2 ^ 0xaa)) $((0x$B3 ^ 0xaa))) if [ "$(cat /proc/device-tree/aliases/uart0)" = "$(cat /proc/device-tree/aliases/serial1)" ] ; then if [ "$(wc -c /proc/device-tree/soc/gpio@7e200000/uart0_pins/brcm\,pins | cut -f 1 -d ' ')" = "16" ] ; then - /usr/bin/hciattach /dev/serial1 bcm43xx 3000000 flow - + $HCIATTACH /dev/serial1 bcm43xx 3000000 flow - $BDADDR else - /usr/bin/hciattach /dev/serial1 bcm43xx 921600 noflow - + $HCIATTACH /dev/serial1 bcm43xx 921600 noflow - $BDADDR fi else - /usr/bin/hciattach /dev/serial1 bcm43xx 460800 noflow - + $HCIATTACH /dev/serial1 bcm43xx 460800 noflow - $BDADDR fi