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
This commit is contained in:
Fabian Vogt 2020-07-23 08:22:28 +00:00 committed by Git OBS Bridge
parent 2820230fdb
commit cdce6fe159
9 changed files with 16 additions and 45 deletions

View File

@ -1 +0,0 @@
install brcmfmac /usr/sbin/install-brcmfmac $CMDLINE_OPTS

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jul 21 14:54:44 UTC 2020 - Matthias Brugger <mbrugger@suse.com>
- 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 <adrian@suse.de>

View File

@ -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

View File

@ -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