From 83e97de3f317c4db97004f389cb1938389ff1417114ae882be8fdf073cff40dd Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 16 Jan 2019 15:37:49 +0000 Subject: [PATCH] Accepting request 666486 from home:mbrugger:branches:Kernel:HEAD - Fix firmware for bcm43430 and bcm43455 (fate#326215) * rename brcmfmac43450 and brcfmac43455 to the compatible name used by brcmf_of_probe * delete brcmfmac43455-sdio.clm_blob as it was not accepted upstream OBS-URL: https://build.opensuse.org/request/show/666486 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=235 --- .gitattributes | 1 - ...pi.txt => brcmfmac43430-sdio.raspberrypi,3-model-b.txt | 0 brcmfmac43455-sdio.clm_blob | 3 --- ...t => brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt | 0 kernel-firmware.changes | 8 ++++++++ kernel-firmware.spec | 7 +++---- 6 files changed, 11 insertions(+), 8 deletions(-) rename brcmfmac43430-sdio.raspberrypi-rpi.txt => brcmfmac43430-sdio.raspberrypi,3-model-b.txt (100%) delete mode 100644 brcmfmac43455-sdio.clm_blob rename brcmfmac43455-sdio.raspberrypi-rpi.txt => brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt (100%) diff --git a/.gitattributes b/.gitattributes index 694d239..ad4a8fc 100644 --- a/.gitattributes +++ b/.gitattributes @@ -23,7 +23,6 @@ *.zst filter=lfs diff=lfs merge=lfs -text ## Specific LFS patterns ast_dp501_fw.bin filter=lfs diff=lfs merge=lfs -text -brcmfmac43455-sdio.clm_blob filter=lfs diff=lfs merge=lfs -text ql2600_fw.bin filter=lfs diff=lfs merge=lfs -text ql2700_fw.bin filter=lfs diff=lfs merge=lfs -text ql8300_fw.bin filter=lfs diff=lfs merge=lfs -text diff --git a/brcmfmac43430-sdio.raspberrypi-rpi.txt b/brcmfmac43430-sdio.raspberrypi,3-model-b.txt similarity index 100% rename from brcmfmac43430-sdio.raspberrypi-rpi.txt rename to brcmfmac43430-sdio.raspberrypi,3-model-b.txt diff --git a/brcmfmac43455-sdio.clm_blob b/brcmfmac43455-sdio.clm_blob deleted file mode 100644 index 9a877a8..0000000 --- a/brcmfmac43455-sdio.clm_blob +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8e2250518bc789e53109728c3c0a6124bc3801a75a1cb4966125753cf1f0252e -size 14036 diff --git a/brcmfmac43455-sdio.raspberrypi-rpi.txt b/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt similarity index 100% rename from brcmfmac43455-sdio.raspberrypi-rpi.txt rename to brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt diff --git a/kernel-firmware.changes b/kernel-firmware.changes index b38b8e7..ce06c28 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jan 15 13:01:17 UTC 2019 - Matthias Brugger + +- Fix firmware for bcm43430 and bcm43455 (fate#326215) + * rename brcmfmac43450 and brcfmac43455 to the compatible name + used by brcmf_of_probe + * delete brcmfmac43455-sdio.clm_blob as it was not accepted upstream + ------------------------------------------------------------------- Fri Jan 11 12:48:08 UTC 2019 - Matthias Brugger diff --git a/kernel-firmware.spec b/kernel-firmware.spec index 12a1681..aca8aa8 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -36,9 +36,8 @@ Source2: ast_dp501_fw.bin Source8: ql2600_fw.bin Source9: ql2700_fw.bin Source10: ql8300_fw.bin -Source11: brcmfmac43430-sdio.raspberrypi-rpi.txt -Source12: brcmfmac43455-sdio.clm_blob -Source13: brcmfmac43455-sdio.raspberrypi-rpi.txt +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 @@ -96,7 +95,7 @@ This package contains the microcode files used by AMD CPUs. %prep %setup -q cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} . -cp %{SOURCE11} %{SOURCE12} %{SOURCE13} brcm/ +cp %{SOURCE11} %{SOURCE12} brcm/ %build # nothing to do