Skip to contentSkip to conversation

package/linux-firmware: remove duplicated entries for brcmfmac4366b-pcie.bin and brcmfmac4366c-pcie.bin

PATCH In review Peter Seiderer 3 participants 4 messages Jul 6, 2021 – Aug 4, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/linux-firmware: remove duplicated entries for brcmfmac4366b-pcie.bin and brcmfmac4366c-pcie.bin

Remove duplicated entries for brcmfmac4366b-pcie.bin and brcmfmac4366c-pcie.bin (present since addition with commit ca6e3f4b900a2cca605d44cffcc463db432ac0ac)

---
 package/linux-firmware/linux-firmware.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
package/linux-firmware/linux-firmware.mk +2 -4
index 9adab67bf1..a621619624 100644
@@ -618,15 +618,13 @@ endif
 
 # brcm4366b1
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM4366B1),y)
-LINUX_FIRMWARE_FILES += \
-	brcm/brcmfmac4366b-pcie.bin brcm/brcmfmac4366b-pcie.bin
+LINUX_FIRMWARE_FILES += brcm/brcmfmac4366b-pcie.bin
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx
 endif
 
 # brcm4366c0
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM4366C0),y)
-LINUX_FIRMWARE_FILES += \
-	brcm/brcmfmac4366c-pcie.bin brcm/brcmfmac4366c-pcie.bin
+LINUX_FIRMWARE_FILES += brcm/brcmfmac4366c-pcie.bin
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx
 endif
 
Signature · 1 line
2.32.0
#1 lore raw

PATCH 2/2 package/linux-firmware: bump version to 20210511

- update hash of WHENCE file

- update BRCM_BCM43XX and BRCM_BCM43XXX entries (omitting the new ones with spaces in the path name 'brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt' and 'brcm/brcmfmac43455-sdio.MINIX-NEO Z83-4.txt') and convert to one entry per line format (easier to parse and update)

- fix WHENCE evaluation for new link entries with spaces (otherwise reports the following warning '/bin/sh: line 1: test: too many arguments' and does not create the link), e.g.:

	Link: brcm/brcmfmac43455-sdio.Raspberry\ Pi\ Foundation-Raspberry\ Pi\ 4\ Model\ B.txt -> brcmfmac43455-sdio.raspberrypi,4-model-b.txt
	Link: brcm/brcmfmac43455-sdio.Raspberry\ Pi\ Foundation-Raspberry\ Pi\ Compute\ Module\ 4.txt -> brcmfmac43455-sdio.raspberrypi,4-model-b.txt
---
 package/linux-firmware/linux-firmware.hash |  4 +-
 package/linux-firmware/linux-firmware.mk   | 55 +++++++++++++++-------
 2 files changed, 39 insertions(+), 20 deletions(-)
package/linux-firmware/linux-firmware.hash +2 -2
index 12af68f2d3..22d6ddf88f 100644
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  f97d6d884026c5e3641909946713dcfea580c307d47830d37d42bfcc9a93870a  linux-firmware-20201022-br1.tar.gz
+sha256  4341b33c64afd8e471de06f1459f63a76445b1ea83055fe3d4103dfb2e1b25ec  linux-firmware-20210511-br1.tar.gz
 sha256  8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9  LICENCE.Abilis
 sha256  8d5847d2971241d4d6a51c16e206379de53a6d4e203fa6f8e1c1e9279c7c4ad0  LICENSE.amdgpu
 sha256  2d6062d63b91eb750bf741498691604f75184b9fee97608ec537cd09bd6a42b4  LICENCE.Marvell
@@ -30,6 +30,6 @@ sha256  8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e  LICENS
 sha256  be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc  LICENSE.qcom
 sha256  fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f  LICENSE.radeon
 sha256  2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9  LICENSE.sdma_firmware
-sha256  18313654864adbb76514e21566528ce57eff42a2a7a66d5823f1f91e895816ea  WHENCE
+sha256  dcc87a24f18d46a73985e68c378ec6d7e7fd4083eb4d4f3130a34fe3f75aff6f  WHENCE
 sha256  fa43e1b9a13b341a07adca9dbe73d0f9072d7966fdfe811c01f0dd2872d7309a  qcom/NOTICE.txt
 sha256  bef9c828e84f21e7835b4de7daf954a327e1ff777871b58e116039b684c0d604  LICENCE.e100
package/linux-firmware/linux-firmware.mk +37 -18

79 lines not on this page · raw message

Signature · 1 line
2.32.0
#2 lore raw

PATCH 1/2 package/linux-firmware: remove duplicated entries for brcmfmac4366b-pcie.bin and brcmfmac4366c-pcie.bin

In reply to Peter Seiderer
Quoted 8 lines · On Tue, 6 Jul 2021 16:11:31 +0200 Peter Seiderer <[email protected]> wrote:

Remove duplicated entries for brcmfmac4366b-pcie.bin and brcmfmac4366c-pcie.bin (present since addition with commit ca6e3f4b900a2cca605d44cffcc463db432ac0ac)

---
 package/linux-firmware/linux-firmware.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Both applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw
In reply to Peter Seiderer
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

Remove duplicated entries for brcmfmac4366b-pcie.bin and brcmfmac4366c-pcie.bin (present since addition with commit ca6e3f4b900a2cca605d44cffcc463db432ac0ac)

Committed to 2021.02.x and 2021.05.x, thanks.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
http://lists.busybox.net/mailman/listinfo/buildroot