From cdce6fe159d74821aa31ce1afdcf41e9009e77321edd084d046f67ef98b6207a Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 23 Jul 2020 08:22:28 +0000 Subject: [PATCH] Accepting request 822129 from home:mbrugger:branches:hardware - brcmfmac driver loads file depending on compatible. Rename files correspondingly. - delete modprobe config file and install-brcmfmac.sh as no longer needed. OBS-URL: https://build.opensuse.org/request/show/822129 OBS-URL: https://build.opensuse.org/package/show/hardware/bcm43xx-firmware?expand=0&rev=30 --- 50-brcmfmac.conf | 1 - bcm43xx-firmware.changes | 6 ++++ bcm43xx-firmware.spec | 29 +++++++------------ ... brcmfmac4329-sdio.solidrun,cubox-i-dl.txt | 0 ...> brcmfmac4330-sdio.solidrun,cubox-i-q.txt | 0 ...rcmfmac43362-sdio.cubietech,cubietruck.txt | 0 ... => brcmfmac43362-sdio.sinovoip,bpi-m2.txt | 0 ...fmac4339-sdio.tronsmart,vega-s95-telos.txt | 0 install-brcmfmac.sh | 25 ---------------- 9 files changed, 16 insertions(+), 45 deletions(-) delete mode 100644 50-brcmfmac.conf rename brcmfmac4329-sdio-cubox-i.txt => brcmfmac4329-sdio.solidrun,cubox-i-dl.txt (100%) rename brcmfmac4330-sdio-cubox-i.txt => brcmfmac4330-sdio.solidrun,cubox-i-q.txt (100%) rename brcmfmac43362-sdio-bananapi-m2.txt => brcmfmac43362-sdio.cubietech,cubietruck.txt (100%) rename brcmfmac43362-sdio-cubietruck.txt => brcmfmac43362-sdio.sinovoip,bpi-m2.txt (100%) rename brcmfmac4339-sdio-vega-s95-telos.txt => brcmfmac4339-sdio.tronsmart,vega-s95-telos.txt (100%) delete mode 100644 install-brcmfmac.sh diff --git a/50-brcmfmac.conf b/50-brcmfmac.conf deleted file mode 100644 index 66a500d..0000000 --- a/50-brcmfmac.conf +++ /dev/null @@ -1 +0,0 @@ -install brcmfmac /usr/sbin/install-brcmfmac $CMDLINE_OPTS diff --git a/bcm43xx-firmware.changes b/bcm43xx-firmware.changes index 5c69176..5b287a0 100644 --- a/bcm43xx-firmware.changes +++ b/bcm43xx-firmware.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jul 21 14:54:44 UTC 2020 - Matthias Brugger + +- brcmfmac driver loads file depending on compatible. Rename files correspondingly. +- delete modprobe config file and install-brcmfmac.sh as no longer needed. + ------------------------------------------------------------------- Mon Feb 3 07:52:50 UTC 2020 - Adrian Schröter diff --git a/bcm43xx-firmware.spec b/bcm43xx-firmware.spec index 7100187..767aa35 100644 --- a/bcm43xx-firmware.spec +++ b/bcm43xx-firmware.spec @@ -27,19 +27,17 @@ URL: https://community.cypress.com/community/linux # Phil Elwell (Raspberry Pi Foundation) wrote: "Broadcom have said that # the firmware files for the BCM43438 are covered under this licence:" Source0: https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/plain/LICENCE.broadcom_bcm43xx -Source1: 50-brcmfmac.conf -Source2: install-brcmfmac.sh # The BCM43XXXX.hcd files are under this license Source3: https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/LICENCE.cypress #BCM4329 -Source291: https://raw.githubusercontent.com/SolidRun/meta-solidrun-arm-imx6/fido/recipes-bsp/broadcom-nvram-config/files/solidrun-imx6/brcmfmac4329-sdio.txt#/brcmfmac4329-sdio-cubox-i.txt +Source291: https://raw.githubusercontent.com/SolidRun/meta-solidrun-arm-imx6/fido/recipes-bsp/broadcom-nvram-config/files/solidrun-imx6/brcmfmac4329-sdio.txt#/brcmfmac4329-sdio.solidrun,cubox-i-dl.txt #BCM4330 -Source301: https://raw.githubusercontent.com/SolidRun/meta-solidrun-arm-imx6/fido/recipes-bsp/broadcom-nvram-config/files/solidrun-imx6/brcmfmac4330-sdio.txt#/brcmfmac4330-sdio-cubox-i.txt +Source301: https://raw.githubusercontent.com/SolidRun/meta-solidrun-arm-imx6/fido/recipes-bsp/broadcom-nvram-config/files/solidrun-imx6/brcmfmac4330-sdio.txt#/brcmfmac4330-sdio.solidrun,cubox-i-q.txt #BCM4339 -Source391: brcmfmac4339-sdio-vega-s95-telos.txt +Source391: brcmfmac4339-sdio.tronsmart,vega-s95-telos.txt #BCM43362 -Source3621: http://dl.cubieboard.org/public/Cubieboard/benn/firmware/ap6210/nvram_ap6210.txt#/brcmfmac43362-sdio-cubietruck.txt -Source3622: https://github.com/Bananian/bananian/raw/master/deb/u-boot-m2-bananian_armhf/lib/firmware/brcm/brcmfmac43362-sdio.txt#/brcmfmac43362-sdio-bananapi-m2.txt +Source3621: http://dl.cubieboard.org/public/Cubieboard/benn/firmware/ap6210/nvram_ap6210.txt#/brcmfmac43362-sdio.cubietech,cubietruck.txt +Source3622: https://github.com/Bananian/bananian/raw/master/deb/u-boot-m2-bananian_armhf/lib/firmware/brcm/brcmfmac43362-sdio.txt#/brcmfmac43362-sdio.sinovoip,bpi-m2.txt #BCM43430 Source4309: https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM43430A1.hcd #brcmfmac4356-pcie.txt is taken from ChromeOS repo @@ -70,10 +68,6 @@ cp %{SOURCE0} %{SOURCE3} . %build %install -mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d -install -c -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/modprobe.d -mkdir -p %{buildroot}%{_sbindir} -install -c -m 0755 %{SOURCE2} %{buildroot}%{_sbindir}/install-brcmfmac # Used by brcmfmac mkdir -p %{buildroot}/lib/firmware/brcm install -c -m 0644 %{SOURCE291} %{buildroot}/lib/firmware/brcm/ @@ -90,13 +84,10 @@ install -c -m 0644 %{SOURCE4559} %{buildroot}/lib/firmware/ %license LICENCE.broadcom_bcm43xx LICENCE.cypress /lib/firmware/*.hcd /lib/firmware/brcm/*.txt -%ghost /lib/firmware/brcm/brcmfmac4329-sdio.txt -%ghost /lib/firmware/brcm/brcmfmac4330-sdio.txt -%ghost /lib/firmware/brcm/brcmfmac4339-sdio.txt -%ghost /lib/firmware/brcm/brcmfmac43362-sdio.txt -%ghost /lib/firmware/brcm/brcmfmac43430-sdio.txt -%ghost /lib/firmware/brcm/brcmfmac43455-sdio.txt -%{_sysconfdir}/modprobe.d/50-brcmfmac.conf -%{_sbindir}/install-brcmfmac +/lib/firmware/brcm/brcmfmac4329-sdio.solidrun,cubox-i-dl.txt +/lib/firmware/brcm/brcmfmac4330-sdio.solidrun,cubox-i-q.txt +/lib/firmware/brcm/brcmfmac4339-sdio.tronsmart,vega-s95-telos.txt +/lib/firmware/brcm/brcmfmac43362-sdio.sinovoip,bpi-m2.txt +/lib/firmware/brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt %changelog diff --git a/brcmfmac4329-sdio-cubox-i.txt b/brcmfmac4329-sdio.solidrun,cubox-i-dl.txt similarity index 100% rename from brcmfmac4329-sdio-cubox-i.txt rename to brcmfmac4329-sdio.solidrun,cubox-i-dl.txt diff --git a/brcmfmac4330-sdio-cubox-i.txt b/brcmfmac4330-sdio.solidrun,cubox-i-q.txt similarity index 100% rename from brcmfmac4330-sdio-cubox-i.txt rename to brcmfmac4330-sdio.solidrun,cubox-i-q.txt diff --git a/brcmfmac43362-sdio-bananapi-m2.txt b/brcmfmac43362-sdio.cubietech,cubietruck.txt similarity index 100% rename from brcmfmac43362-sdio-bananapi-m2.txt rename to brcmfmac43362-sdio.cubietech,cubietruck.txt diff --git a/brcmfmac43362-sdio-cubietruck.txt b/brcmfmac43362-sdio.sinovoip,bpi-m2.txt similarity index 100% rename from brcmfmac43362-sdio-cubietruck.txt rename to brcmfmac43362-sdio.sinovoip,bpi-m2.txt diff --git a/brcmfmac4339-sdio-vega-s95-telos.txt b/brcmfmac4339-sdio.tronsmart,vega-s95-telos.txt similarity index 100% rename from brcmfmac4339-sdio-vega-s95-telos.txt rename to brcmfmac4339-sdio.tronsmart,vega-s95-telos.txt diff --git a/install-brcmfmac.sh b/install-brcmfmac.sh deleted file mode 100644 index c22daec..0000000 --- a/install-brcmfmac.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -if [[ -e /sys/firmware/devicetree/base/compatible ]]; then - while IFS= read -r -d '' compatible; do - case "$compatible" in - sinovoip,bpi-m2) - ln -sf brcmfmac43362-sdio-bananapi-m2.txt /lib/firmware/brcm/brcmfmac43362-sdio.txt - ;; - cubietech,cubietruck) - ln -sf brcmfmac43362-sdio-cubietruck.txt /lib/firmware/brcm/brcmfmac43362-sdio.txt - ;; - solidrun,cubox-i) - ln -sf brcmfmac4329-sdio-cubox-i.txt /lib/firmware/brcm/brcmfmac4329-sdio.txt - ln -sf brcmfmac4330-sdio-cubox-i.txt /lib/firmware/brcm/brcmfmac4330-sdio.txt - ;; - tronsmart,vega-s95-telos) - ln -sf brcmfmac4339-sdio-vega-s95-telos.txt /lib/firmware/brcm/brcmfmac4339-sdio.txt - ;; - esac - done < /sys/firmware/devicetree/base/compatible -fi - -/usr/sbin/modprobe --ignore-install brcmfmac "$@" || exit $? - -exit 0