From aea660795f2c928771707b4a7c24b847ebf7797a36d630076721521a0fd6331f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 28 Jan 2019 16:30:52 +0000 Subject: [PATCH 1/2] Accepting request 669006 from home:mbrugger:branches:hardware - Remove files that are now present in kernel-firmware. - Delete softlink creation for this files. OBS-URL: https://build.opensuse.org/request/show/669006 OBS-URL: https://build.opensuse.org/package/show/hardware/bcm43xx-firmware?expand=0&rev=21 --- bcm43xx-firmware.changes | 6 ++ bcm43xx-firmware.spec | 10 +-- brcmfmac43362-sdio-bananapi-m1+.txt | 57 ---------------- brcmfmac43430-sdio-raspberrypi3b.txt | 64 ------------------ brcmfmac43455-sdio-raspberrypi3b.txt | 97 ---------------------------- install-brcmfmac.sh | 7 -- 6 files changed, 8 insertions(+), 233 deletions(-) delete mode 100644 brcmfmac43362-sdio-bananapi-m1+.txt delete mode 100644 brcmfmac43430-sdio-raspberrypi3b.txt delete mode 100644 brcmfmac43455-sdio-raspberrypi3b.txt diff --git a/bcm43xx-firmware.changes b/bcm43xx-firmware.changes index 8f893ff..95ce29a 100644 --- a/bcm43xx-firmware.changes +++ b/bcm43xx-firmware.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 24 17:22:16 UTC 2019 - Matthias Brugger + +- Remove files that are now present in kernel-firmware. +- Delete softlink creation for this files. + ------------------------------------------------------------------- Thu Aug 30 12:06:49 UTC 2018 - fvogt@suse.com diff --git a/bcm43xx-firmware.spec b/bcm43xx-firmware.spec index af6a2f2..6f04d8c 100644 --- a/bcm43xx-firmware.spec +++ b/bcm43xx-firmware.spec @@ -1,7 +1,7 @@ # # spec file for package bcm43xx-firmware # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -40,15 +40,12 @@ Source391: brcmfmac4339-sdio-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 -Source3623: https://github.com/Bananian/bananian/raw/master/deb/u-boot-pro-bananian_armhf/lib/firmware/brcm/brcmfmac43362-sdio.txt#/brcmfmac43362-sdio-bananapi-m1+.txt #BCM43430 -Source4301: https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm/brcmfmac43430-sdio.txt#/brcmfmac43430-sdio-raspberrypi3b.txt Source4309: https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM43430A1.hcd #brcmfmac4356-pcie.txt is taken from ChromeOS repo # https://chromium.googlesource.com/chromiumos/third_party/linux-firmware/+/f151f016b4fe656399f199e28cabf8d658bcb52b/brcm/brcmfmac4356-pcie.txt Source4356: brcmfmac4356-pcie.txt #BCM43455 -Source4551: https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm/brcmfmac43455-sdio.txt#/brcmfmac43455-sdio-raspberrypi3b.txt Source4559: https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM4345C0.hcd # Owns /lib/firmware/brcm and potentially conflicts BuildRequires: kernel-firmware @@ -85,9 +82,6 @@ install -c -m 0644 %{SOURCE301} %{buildroot}/lib/firmware/brcm/ install -c -m 0644 %{SOURCE391} %{buildroot}/lib/firmware/brcm/ install -c -m 0644 %{SOURCE3621} %{buildroot}/lib/firmware/brcm/ install -c -m 0644 %{SOURCE3622} %{buildroot}/lib/firmware/brcm/ -install -c -m 0644 %{SOURCE3623} %{buildroot}/lib/firmware/brcm/ -install -c -m 0644 %{SOURCE4301} %{buildroot}/lib/firmware/brcm/ -install -c -m 0644 %{SOURCE4551} %{buildroot}/lib/firmware/brcm/ install -c -m 0644 %{SOURCE4356} %{buildroot}/lib/firmware/brcm/ # Used by bluez (hciattach) install -c -m 0644 %{SOURCE4309} %{buildroot}/lib/firmware/ diff --git a/brcmfmac43362-sdio-bananapi-m1+.txt b/brcmfmac43362-sdio-bananapi-m1+.txt deleted file mode 100644 index ac55a0c..0000000 --- a/brcmfmac43362-sdio-bananapi-m1+.txt +++ /dev/null @@ -1,57 +0,0 @@ -#AP6210_NVRAM_V1.2_03192013 -manfid=0x2d0 -prodid=0x492 -vendid=0x14e4 -devid=0x4343 -boardtype=0x0598 - -# Board Revision is P307, same nvram file can be used for P304, P305, P306 and P307 as the tssi pa params used are same -#Please force the automatic RX PER data to the respective board directory if not using P307 board, for e.g. for P305 boards force the data into the following directory /projects/BCM43362/a1_labdata/boardtests/results/sdg_rev0305 -boardrev=0x1307 -boardnum=777 -xtalfreq=26000 -boardflags=0x80201 -boardflags2=0x80 -sromrev=3 -wl0id=0x431b -macaddr=00:90:4c:07:71:12 -aa2g=1 -ag0=2 -maxp2ga0=74 -cck2gpo=0x2222 -ofdm2gpo=0x44444444 -mcs2gpo0=0x6666 -mcs2gpo1=0x6666 -pa0maxpwr=56 - -#P207 PA params -#pa0b0=5447 -#pa0b1=-658 -#pa0b2=-175
- -#Same PA params for P304,P305, P306, P307 - -pa0b0=5447 -pa0b1=-607 -pa0b2=-160 -pa0itssit=62 -pa1itssit=62 - - -cckPwrOffset=5 -ccode=0 -rssismf2g=0xa -rssismc2g=0x3 -rssisav2g=0x7 -triso2g=0 -noise_cal_enable_2g=0 -noise_cal_po_2g=0 -swctrlmap_2g=0x04040404,0x02020202,0x02020202,0x010101,0x1ff -temp_add=29767 -temp_mult=425 - -btc_flags=0x6 -btc_params0=5000 -btc_params1=1000 -btc_params6=63 - diff --git a/brcmfmac43430-sdio-raspberrypi3b.txt b/brcmfmac43430-sdio-raspberrypi3b.txt deleted file mode 100644 index a653079..0000000 --- a/brcmfmac43430-sdio-raspberrypi3b.txt +++ /dev/null @@ -1,64 +0,0 @@ -# NVRAM file for BCM943430WLSELG -# 2.4 GHz, 20 MHz BW mode - -# The following parameter values are just placeholders, need to be updated. -manfid=0x2d0 -prodid=0x0726 -vendid=0x14e4 -devid=0x43e2 -boardtype=0x0726 -boardrev=0x1202 -boardnum=22 -macaddr=00:90:4c:c5:12:38 -sromrev=11 -boardflags=0x00404201 -boardflags3=0x08000000 -xtalfreq=37400 -#xtalfreq=19200 -nocrc=1 -ag0=255 -aa2g=1 -ccode=ALL - -pa0itssit=0x20 -extpagain2g=0 - -#PA parameters for 2.4GHz, measured at CHIP OUTPUT -pa2ga0=-168,7161,-820 -AvVmid_c0=0x0,0xc8 -cckpwroffset0=5 - -# PPR params -maxp2ga0=84 -txpwrbckof=6 -cckbw202gpo=0 -legofdmbw202gpo=0x66111111 -mcsbw202gpo=0x77711111 -propbw202gpo=0xdd - -# OFDM IIR : -ofdmdigfilttype=18 -ofdmdigfilttypebe=18 -# PAPD mode: -papdmode=1 -papdvalidtest=1 -pacalidx2g=32 -papdepsoffset=-36 -papdendidx=61 - -il0macaddr=00:90:4c:c5:12:38 -wl0id=0x431b - -deadman_to=0xffffffff -# muxenab: 0x1 for UART enable, 0x2 for GPIOs, 0x8 for JTAG -muxenab=0x1 -# CLDO PWM voltage settings - 0x4 - 1.1 volt -#cldo_pwm=0x4 - -#VCO freq 326.4MHz -spurconfig=0x3 - -# Improved Bluetooth coexistence parameters from Cypress -btc_mode=1 -btc_params8=0x4e20 -btc_params1=0x7530 diff --git a/brcmfmac43455-sdio-raspberrypi3b.txt b/brcmfmac43455-sdio-raspberrypi3b.txt deleted file mode 100644 index 52c44d3..0000000 --- a/brcmfmac43455-sdio-raspberrypi3b.txt +++ /dev/null @@ -1,97 +0,0 @@ -# Cloned from bcm94345wlpagb_p2xx.txt -NVRAMRev=$Rev: 498373 $ -sromrev=11 -vendid=0x14e4 -devid=0x43ab -manfid=0x2d0 -prodid=0x06e4 -#macaddr=00:90:4c:c5:12:38 -macaddr=b8:27:eb:74:f2:6c -nocrc=1 -boardtype=0x6e4 -boardrev=0x1304 - -#XTAL 37.4MHz -xtalfreq=37400 - -btc_mode=1 -#------------------------------------------------------ -#boardflags: 5GHz eTR switch by default -# 2.4GHz eTR switch by default -# bit1 for btcoex -boardflags=0x00480201 -boardflags2=0x40800000 -boardflags3=0x48200100 -phycal_tempdelta=15 -rxchain=1 -txchain=1 -aa2g=1 -aa5g=1 -tssipos5g=1 -tssipos2g=1 -femctrl=0 -AvVmid_c0=1,165,2,100,2,100,2,100,2,100 -pa2ga0=-129,6525,-718 -pa2ga1=-149,4408,-601 -pa5ga0=-185,6836,-815,-186,6838,-815,-184,6859,-815,-184,6882,-818 -pa5ga1=-202,4285,-574,-201,4312,-578,-196,4391,-586,-201,4294,-575 -itrsw=1 -pdoffsetcckma0=2 -pdoffset2gperchan=0,-2,1,0,1,0,1,1,1,0,0,-1,-1,0 -pdoffset2g40ma0=16 -pdoffset40ma0=0x8888 -pdoffset80ma0=0x8888 -extpagain5g=2 -extpagain2g=2 -tworangetssi2g=1 -tworangetssi5g=1 -# LTECX flags -# WCI2 -ltecxmux=0 -ltecxpadnum=0x0504 -ltecxfnsel=0x22 -ltecxgcigpio=0x32 - -maxp2ga0=80 -ofdmlrbw202gpo=0x0022 -dot11agofdmhrbw202gpo=0x4442 -mcsbw202gpo=0x98444422 -mcsbw402gpo=0x98444422 -maxp5ga0=82,82,82,82 -mcsbw205glpo=0xb9555000 -mcsbw205gmpo=0xb9555000 -mcsbw205ghpo=0xb9555000 -mcsbw405glpo=0xb9555000 -mcsbw405gmpo=0xb9555000 -mcsbw405ghpo=0xb9555000 -mcsbw805glpo=0xb9555000 -mcsbw805gmpo=0xb9555000 -mcsbw805ghpo=0xb9555000 - -swctrlmap_2g=0x00000000,0x00000000,0x00000000,0x010000,0x3ff -swctrlmap_5g=0x00100010,0x00200020,0x00200020,0x010000,0x3fe -swctrlmapext_5g=0x00000000,0x00000000,0x00000000,0x000000,0x3 -swctrlmapext_2g=0x00000000,0x00000000,0x00000000,0x000000,0x3 - -vcodivmode=1 -deadman_to=481500000 - -ed_thresh2g=-54 -ed_thresh5g=-54 -eu_edthresh2g=-54 -eu_edthresh5g=-54 -ldo1=4 -rawtempsense=0x1ff -cckPwrIdxCorr=3 -cckTssiDelay=150 -ofdmTssiDelay=150 -txpwr2gAdcScale=1 -txpwr5gAdcScale=1 -dot11b_opts=0x3aa85 -cbfilttype=1 -fdsslevel_ch11=6 - -# Improved Bluetooth coexistence parameters from Cypress -btc_mode=1 -btc_params8=0x4e20 -btc_params1=0x7530 diff --git a/install-brcmfmac.sh b/install-brcmfmac.sh index 267edc4..c22daec 100644 --- a/install-brcmfmac.sh +++ b/install-brcmfmac.sh @@ -3,9 +3,6 @@ if [[ -e /sys/firmware/devicetree/base/compatible ]]; then while IFS= read -r -d '' compatible; do case "$compatible" in - lemaker,bananapro) - ln -sf brcmfmac43362-sdio-bananapi-m1+.txt /lib/firmware/brcm/brcmfmac43362-sdio.txt - ;; sinovoip,bpi-m2) ln -sf brcmfmac43362-sdio-bananapi-m2.txt /lib/firmware/brcm/brcmfmac43362-sdio.txt ;; @@ -16,10 +13,6 @@ if [[ -e /sys/firmware/devicetree/base/compatible ]]; then 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 ;; - raspberrypi,3-model-b|raspberrypi,3-model-b-plus) - ln -sf brcmfmac43430-sdio-raspberrypi3b.txt /lib/firmware/brcm/brcmfmac43430-sdio.txt - ln -sf brcmfmac43455-sdio-raspberrypi3b.txt /lib/firmware/brcm/brcmfmac43455-sdio.txt - ;; tronsmart,vega-s95-telos) ln -sf brcmfmac4339-sdio-vega-s95-telos.txt /lib/firmware/brcm/brcmfmac4339-sdio.txt ;; From 38e8db1b28ee35d45e5a788863c5f6f685b596c24d6d76c399d5912c2135301c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 28 Jan 2019 16:59:56 +0000 Subject: [PATCH 2/2] Accepting request 669143 from home:mbrugger:branches:hardware - Remove files that are now present in kernel-firmware (fate#326215). - Delete softlink creation for this files. (bsc#1098041). OBS-URL: https://build.opensuse.org/request/show/669143 OBS-URL: https://build.opensuse.org/package/show/hardware/bcm43xx-firmware?expand=0&rev=22 --- bcm43xx-firmware.changes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bcm43xx-firmware.changes b/bcm43xx-firmware.changes index 95ce29a..b2a6bbe 100644 --- a/bcm43xx-firmware.changes +++ b/bcm43xx-firmware.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Thu Jan 24 17:22:16 UTC 2019 - Matthias Brugger -- Remove files that are now present in kernel-firmware. -- Delete softlink creation for this files. +- Remove files that are now present in kernel-firmware (fate#326215). +- Delete softlink creation for this files. (bsc#1098041). ------------------------------------------------------------------- Thu Aug 30 12:06:49 UTC 2018 - fvogt@suse.com