From 074d679ed36ed00b2ea2b9195686ea247410f209ef94ada771cfda11a2be4a9e Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 21 Jan 2019 10:50:43 +0000 Subject: [PATCH] Accepting request 667473 from home:tiwai:branches:Kernel:HEAD - Remove brcm RPi f/w that are already included in the upstream tree OBS-URL: https://build.opensuse.org/request/show/667473 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=238 --- brcmfmac43430-sdio.raspberrypi,3-model-b.txt | 47 ----------- ...c43455-sdio.raspberrypi,3-model-b-plus.txt | 82 ------------------- kernel-firmware.changes | 9 +- kernel-firmware.spec | 5 +- 4 files changed, 8 insertions(+), 135 deletions(-) delete mode 100644 brcmfmac43430-sdio.raspberrypi,3-model-b.txt delete mode 100644 brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt diff --git a/brcmfmac43430-sdio.raspberrypi,3-model-b.txt b/brcmfmac43430-sdio.raspberrypi,3-model-b.txt deleted file mode 100644 index 20a75fa..0000000 --- a/brcmfmac43430-sdio.raspberrypi,3-model-b.txt +++ /dev/null @@ -1,47 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# (C) Copyright 2018 Raspberry Pi (Trading) Ltd. -# NVRAM config file for the BCM43430 WiFi/BT chip as found on the -# Raspberry Pi 3 Model B -aa2g=1 -ag0=255 -AvVmid_c0=0x0,0xc8 -boardflags=0x00404201 -boardflags3=0x08000000 -boardnum=22 -boardrev=0x1202 -boardtype=0x0726 -btc_mode=1 -btc_params1=0x7530 -btc_params8=0x4e20 -cckbw202gpo=0 -cckpwroffset0=5 -ccode=ALL -# cldo_pwm is not set -deadman_to=0xffffffff -devid=0x43e2 -extpagain2g=0 -il0macaddr=00:90:4c:c5:12:38 -legofdmbw202gpo=0x66111111 -macaddr=00:90:4c:c5:12:38 -manfid=0x2d0 -maxp2ga0=84 -mcsbw202gpo=0x77711111 -muxenab=0x1 -nocrc=1 -ofdmdigfilttype=18 -ofdmdigfilttypebe=18 -pa0itssit=0x20 -pa2ga0=-168,7161,-820 -pacalidx2g=32 -papdendidx=61 -papdepsoffset=-36 -papdmode=1 -papdvalidtest=1 -prodid=0x0726 -propbw202gpo=0xdd -spurconfig=0x3 -sromrev=11 -txpwrbckof=6 -vendid=0x14e4 -wl0id=0x431b -xtalfreq=37400 diff --git a/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt b/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt deleted file mode 100644 index 19e2c81..0000000 --- a/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt +++ /dev/null @@ -1,82 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# (C) Copyright 2018 Raspberry Pi (Trading) Ltd. -# NVRAM config file for the BCM43455 WiFi/BT chip as found on the -# Raspberry Pi 3 Model B+ -aa2g=1 -aa5g=1 -AvVmid_c0=1,165,2,100,2,100,2,100,2,100 -boardflags=0x00480201 -boardflags2=0x40800000 -boardflags3=0x48200100 -boardrev=0x1304 -boardtype=0x6e4 -btc_mode=1 -btc_params1=0x7530 -btc_params8=0x4e20 -cbfilttype=1 -cckPwrIdxCorr=3 -cckTssiDelay=150 -deadman_to=481500000 -devid=0x43ab -dot11agofdmhrbw202gpo=0x4442 -dot11b_opts=0x3aa85 -ed_thresh2g=-54 -ed_thresh5g=-54 -eu_edthresh2g=-54 -eu_edthresh5g=-54 -extpagain2g=2 -extpagain5g=2 -fdsslevel_ch11=6 -femctrl=0 -itrsw=1 -ldo1=4 -ltecxfnsel=0x22 -ltecxgcigpio=0x32 -ltecxmux=0 -ltecxpadnum=0x0504 -macaddr=b8:27:eb:74:f2:6c -manfid=0x2d0 -maxp2ga0=80 -maxp5ga0=82,82,82,82 -mcsbw202gpo=0x98444422 -mcsbw205ghpo=0xb9555000 -mcsbw205glpo=0xb9555000 -mcsbw205gmpo=0xb9555000 -mcsbw402gpo=0x98444422 -mcsbw405ghpo=0xb9555000 -mcsbw405glpo=0xb9555000 -mcsbw405gmpo=0xb9555000 -mcsbw805ghpo=0xb9555000 -mcsbw805glpo=0xb9555000 -mcsbw805gmpo=0xb9555000 -nocrc=1 -ofdmlrbw202gpo=0x0022 -ofdmTssiDelay=150 -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 -pdoffset2g40ma0=16 -pdoffset2gperchan=0,-2,1,0,1,0,1,1,1,0,0,-1,-1,0 -pdoffset40ma0=0x8888 -pdoffset80ma0=0x8888 -pdoffsetcckma0=2 -phycal_tempdelta=15 -prodid=0x06e4 -rawtempsense=0x1ff -rxchain=1 -sromrev=11 -swctrlmap_2g=0x00000000,0x00000000,0x00000000,0x010000,0x3ff -swctrlmap_5g=0x00100010,0x00200020,0x00200020,0x010000,0x3fe -swctrlmapext_2g=0x00000000,0x00000000,0x00000000,0x000000,0x3 -swctrlmapext_5g=0x00000000,0x00000000,0x00000000,0x000000,0x3 -tssipos2g=1 -tssipos5g=1 -tworangetssi2g=1 -tworangetssi5g=1 -txchain=1 -txpwr2gAdcScale=1 -txpwr5gAdcScale=1 -vcodivmode=1 -vendid=0x14e4 -xtalfreq=37400 diff --git a/kernel-firmware.changes b/kernel-firmware.changes index 101581a..5d74c4b 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 21 11:46:20 CET 2019 - tiwai@suse.de + +- Remove brcm RPi f/w that are already included in the upstream tree + ------------------------------------------------------------------- Fri Jan 18 14:25:40 UTC 2019 - Martin Pluskal @@ -36,7 +41,7 @@ Fri Jan 11 12:48:08 UTC 2019 - Matthias Brugger ------------------------------------------------------------------- Thu Dec 20 14:51:24 UTC 2018 - Martin Pluskal -- Update to version 20181218: +- Update to version 20181218: (FATE#326045,FATE#325856,FATE#326294) * Revert "amdgpu: update vega10 fw for 18.50 release" * brcm: Add 4330 NVRAM for the Prowise PT301 tablet * brcm: Add 43430 NVRAM for the Chuwi Vi8 Plus tablet @@ -79,7 +84,7 @@ Mon Dec 17 15:12:19 UTC 2018 - Martin Pluskal ------------------------------------------------------------------- Wed Nov 7 09:35:44 UTC 2018 - Martin Pluskal -- Update to version 20181026: +- Update to version 20181026: (bsc#1122456) * qed: Add 8.37.7.0 firmware image * amdgpu: add raven dmcu firmware * amdgpu: update raven firmware to 18.40 diff --git a/kernel-firmware.spec b/kernel-firmware.spec index b7842d1..84195e5 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -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 https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -36,8 +36,6 @@ Source2: ast_dp501_fw.bin Source8: ql2600_fw.bin Source9: ql2700_fw.bin Source10: ql8300_fw.bin -Source11: brcmfmac43430-sdio.raspberrypi,3-model-b.txt -Source12: brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt Source99: %{name}-rpmlintrc BuildRequires: fdupes BuildRequires: suse-module-tools @@ -95,7 +93,6 @@ This package contains the microcode files used by AMD CPUs. %prep %setup -q cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} . -cp %{SOURCE11} %{SOURCE12} brcm/ %build # nothing to do