[openwrt/openwrt] linux-firmware: update to version 20210315 and trim down broadcom FW

LEDE Commits lede-commits at lists.infradead.org
Sat Jun 5 15:27:53 PDT 2021 

hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/ff2bb16730f629d54bde8ba85c75d8614741e3fd

commit ff2bb16730f629d54bde8ba85c75d8614741e3fd
Author: Josef Schlehofer <pepe.schlehofer at gmail.com>
AuthorDate: Sat May 1 08:51:12 2021 +0200

    linux-firmware: update to version 20210315 and trim down broadcom FW
    
    In there linux-firmware repository located in kernel, there were removed old
    broadcom firmware [1] as they seem to be likely vulnerable to KrØØk vulnerability
    (CVE-2019-15126), because Cypress released new versions and superseded
    by it.
    
    In OpenWrt, there is Makefile for cypress-firmware, which already provides
    the same named packages like it was in linux-firmware. For example, cypress-firmware-43455-sdio
    provides brcmfmac-firmware-43455-sdio [2].
    
    Changelog between 2020118 and 20210315:
    3568f96 (tag: 20210315) linux-firmware: Update firmware file for Intel Bluetooth AX210
    9e96e50 linux-firmware: Update firmware file for Intel Bluetooth AX200
    c8d0db5 linux-firmware: Update firmware file for Intel Bluetooth AX201
    5e2a387 Merge tag 'iwlwifi-fw-2021-03-05-v3' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware into main
    b0d3e31 rtw88: 8822c: Update normal firmware to v9.9.6
    5a2fd63 iwlwifi: add new FWs from core59-66 release
    4f54906 iwlwifi: update 9000-family firmwares
    11b7607 iwlwifi: update 7265D firmware
    e425f76 Merge branch 'add-silabs-wf200' of github.com:jerome-pouiller/linux-firmware into main
    5ecd13f Mellanox: Add new mlxsw_spectrum firmware xx.2008.2406
    58fb90a linux-firmware: add frimware for mediatek bluetooth chip (MT7921)
    e576a1b rtw89: 8852a: add firmware v0.9.12.2
    048a7cb WHENCE: add missing symlink for BananaPi M3
    aa6c6e7 Add symlink for BananaPi M2 to brcmfmac43430-sdio config
    58825f7 brcm: Fix Raspberry Pi 4B NVRAM file
    520f71b silabs: add new firmware for WF200
    f7915a0 amdgpu: add initial firmware for green sardine
    80cb579 rtw88: RTL8822C: Update normal firmware to v9.9.5
    b79d239 (tag: 20210208) Merge branch 'DG1-guc-huc-ADLS-dmc' of git://anongit.freedesktop.org/drm/drm-firmware into main
    66970e1 Merge branch 'qcom-rb5' of https://github.com/lumag/linux-firmware into main
    cf6fc2b Mellanox: Add new mlxsw_spectrum firmware xx.2008.2304
    391fd50 linux-firmware: add firmware for MT7921
    c5e3240 rtw88: RTL8821C: Update firmware to v24.8
    d33d2d8 linux-firmware: Update firmware file for Intel Bluetooth AX210
    3027ae4 linux-firmware: Update firmware file for Intel Bluetooth AX200
    13979c3 linux-firmware: Update firmware file for Intel Bluetooth AX201
    348d8a9 i915: Add DMC v2.01 for ADL-S
    f33f1f7 i915: Add HuC v7.7.1 for DG1
    6a422f5 i915: Add GuC v49.0.1 for DG1
    df822a8 qcom: Add venus firmware files for VPU-1.0
    11a1db1 qcom: Add SM8250 Compute DSP firmware
    e55248b qcom: Add SM8250 Audio DSP firmware
    da74cc6 qcom: add firmware files for Adreno a650
    0578970 brcm: Link RPi4's WiFi firmware with DMI machine name.
    d528862 brcm: Add NVRAM for Vamrs 96boards Rock960
    870b805 brcm: Update Raspberry Pi 3B+/4B NVRAM for downstream changes
    a28a590 cypress: Fix link direction
    060ad8b cypress: Link the new cypress firmware to the old brcm files
    0f0aefd brcm: remove old brcm firmwares that have newer cypress variants
    f580dc2 rtl_bt: Update RTL8822C BT(UART I/F) FW to 0x059A_25CB
    7df2220 rtl_bt: Update RTL8822C BT(USB I/F) FW to 0x099a_7253
    e79405d rtl_bt: Add firmware and config files for RTL8852A BT USB chip
    ef3813d rtl_bt: Update RTL8821C BT(USB I/F) FW to 0x829a_7644
    646f159 (tag: 20201218) make AP6212 in bananpi m2 plus/zero work
    28185ec linux-firmware: Update firmware file for Intel Bluetooth AX210
    23da869 linux-firmware: Update firmware file for Intel Bluetooth AX200
    2099248 linux-firmware: Update firmware file for Intel Bluetooth AX201
    94de5e2 linux-firmware: Update firmware file for Intel Bluetooth 9560
    27a3689 linux-firmware: Update firmware file for Intel Bluetooth 9260
    5c3c4af Merge branch 'lt9611uxc' of https://github.com/lumag/linux-firmware into main
    aaed4a8 Merge branch 'v1.1.6' of https://github.com/irui-wang/linux_fw_vpu_v1.1.6 into main
    d8c9865 Merge branch 'master' of https://github.com/sampnimm/linux-firmware-BT into main
    63ab3db linux-firmware: add firmware for Lontium LT9611UXC DSI to HDMI bridge
    0fe0fe0 mediatek: update MT8173 VPU firmware to v1.1.6
    1a08ec9 QCA : Updated firmware files for WCN3991
    7455a36 Merge branch 'guc_v49' of git://anongit.freedesktop.org/drm/drm-firmware into main
    7eb7fda linux-firmware: Update firmware file for Intel Bluetooth AX210
    5cbf459 linux-firmware: Update firmware file for Intel Bluetooth AX210
    c487f7d i915: Add GuC firmware v49.0.1 for all platforms
    d9ffb07 i915: Remove duplicate KBL DMC entry
    b362fd4 Mellanox: Add new mlxsw_spectrum firmware xx.2008.2018
    bc9cd0b linux-firmware: Update AMD SEV firmware
    54c797a amdgpu: add sienna cichlid firmware for 20.45
    1340e9c amdgpu: update vega20 firmware for 20.45
    b260c9c amdgpu: update vega12 firmware for 20.45
    d683bd5 amdgpu: update vega10 firmware for 20.45
    7c81cc2 amdgpu: update renoir firmware for 20.45
    3619e57 amdgpu: update navi14 firmware for 20.45
    68ce0fb amdgpu: update navi12 firmware for 20.45
    e889b80 amdgpu: update navi10 firmware for 20.45
    f4edc15 amdgpu: update raven2 firmware for 20.45
    e71210f amdgpu: update raven firmware for 20.45
    
    [1] https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=0f0aefd733f70beae4c0246edbd2c158d5ce974c
    
    [2] https://github.com/openwrt/openwrt/blob/eeda8652f1655d4f9c11e9c9f51ddcd3377d119a/package/firmware/cypress-firmware/Makefile#L124
    
    Signed-off-by: Josef Schlehofer <pepe.schlehofer at gmail.com>
---
 package/firmware/linux-firmware/Makefile    |  6 +++---
 package/firmware/linux-firmware/broadcom.mk | 27 ---------------------------
 target/linux/sunxi/image/cortexa7.mk        |  8 ++++----
 3 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/package/firmware/linux-firmware/Makefile b/package/firmware/linux-firmware/Makefile
index 7fb99dd2ce..e2fee3b6a2 100644
--- a/package/firmware/linux-firmware/Makefile
+++ b/package/firmware/linux-firmware/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=linux-firmware
-PKG_VERSION:=20201118
-PKG_RELEASE:=3
+PKG_VERSION:=20210315
+PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=@KERNEL/linux/kernel/firmware
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_HASH:=863d5a31da725b856a917280d1e3014929b3bc3d4e6e5faecf530c13afb7e2b9
+PKG_HASH:=a2348f03492713dca9aef202496c6e58f5e63ee5bec6a7bdfcf8b18ce7155e70
 
 PKG_MAINTAINER:=Felix Fietkau <nbd at nbd.name>
 
diff --git a/package/firmware/linux-firmware/broadcom.mk b/package/firmware/linux-firmware/broadcom.mk
index 00f7076104..26f6534632 100644
--- a/package/firmware/linux-firmware/broadcom.mk
+++ b/package/firmware/linux-firmware/broadcom.mk
@@ -34,24 +34,6 @@ define Package/brcmfmac-firmware-4329-sdio/install
 endef
 $(eval $(call BuildPackage,brcmfmac-firmware-4329-sdio))
 
-Package/brcmfmac-firmware-43362-sdio = $(call Package/firmware-default,Broadcom BCM43362 FullMac SDIO firmware)
-define Package/brcmfmac-firmware-43362-sdio/install
-	$(INSTALL_DIR) $(1)/lib/firmware/brcm
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/brcm/brcmfmac43362-sdio.bin \
-		$(1)/lib/firmware/brcm/brcmfmac43362-sdio.bin
-endef
-$(eval $(call BuildPackage,brcmfmac-firmware-43362-sdio))
-
-Package/brcmfmac-firmware-43430-sdio = $(call Package/firmware-default,Broadcom BCM43430 FullMac SDIO firmware)
-define Package/brcmfmac-firmware-43430-sdio/install
-	$(INSTALL_DIR) $(1)/lib/firmware/brcm
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/brcm/brcmfmac43430-sdio.bin \
-		$(1)/lib/firmware/brcm/brcmfmac43430-sdio.bin
-endef
-$(eval $(call BuildPackage,brcmfmac-firmware-43430-sdio))
-
 Package/brcmfmac-firmware-43430-sdio-rpi-3b = $(call Package/firmware-default,Broadcom BCM43430 NVRAM for Raspberry Pi 3B)
 define Package/brcmfmac-firmware-43430-sdio-rpi-3b/install
 	$(INSTALL_DIR) $(1)/lib/firmware/brcm
@@ -79,15 +61,6 @@ define Package/brcmfmac-firmware-43430a0-sdio/install
 endef
 $(eval $(call BuildPackage,brcmfmac-firmware-43430a0-sdio))
 
-Package/brcmfmac-firmware-43455-sdio = $(call Package/firmware-default,Broadcom BCM43455 FullMac SDIO firmware)
-define Package/brcmfmac-firmware-43455-sdio/install
-	$(INSTALL_DIR) $(1)/lib/firmware/brcm
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/brcm/brcmfmac43455-sdio.bin \
-		$(1)/lib/firmware/brcm/brcmfmac43455-sdio.bin
-endef
-$(eval $(call BuildPackage,brcmfmac-firmware-43455-sdio))
-
 Package/brcmfmac-firmware-43455-sdio-rpi-3b-plus = $(call Package/firmware-default,Broadcom BCM43455 NVRAM for Raspberry Pi 3B+)
 define Package/brcmfmac-firmware-43455-sdio-rpi-3b-plus/install
 	$(INSTALL_DIR) $(1)/lib/firmware/brcm
diff --git a/target/linux/sunxi/image/cortexa7.mk b/target/linux/sunxi/image/cortexa7.mk
index 01474a20cb..59f11bc83c 100644
--- a/target/linux/sunxi/image/cortexa7.mk
+++ b/target/linux/sunxi/image/cortexa7.mk
@@ -23,7 +23,7 @@ define Device/friendlyarm_nanopi-m1-plus
   DEVICE_VENDOR := FriendlyARM
   DEVICE_MODEL := NanoPi M1 Plus
   DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-leds-gpio kmod-brcmfmac \
-	brcmfmac-firmware-43430-sdio wpad-basic-wolfssl
+	cypress-firmware-43430-sdio wpad-basic-wolfssl
   SOC := sun8i-h3
 endef
 TARGET_DEVICES += friendlyarm_nanopi-m1-plus
@@ -39,7 +39,7 @@ define Device/friendlyarm_nanopi-neo-air
   DEVICE_VENDOR := FriendlyARM
   DEVICE_MODEL := NanoPi NEO Air
   DEVICE_PACKAGES := kmod-rtc-sunxi kmod-leds-gpio kmod-brcmfmac \
-	brcmfmac-firmware-43430-sdio wpad-basic-wolfssl
+	cypress-firmware-43430-sdio wpad-basic-wolfssl
   SOC := sun8i-h3
 endef
 TARGET_DEVICES += friendlyarm_nanopi-neo-air
@@ -48,7 +48,7 @@ define Device/friendlyarm_nanopi-r1
   DEVICE_VENDOR := FriendlyARM
   DEVICE_MODEL := NanoPi R1
   DEVICE_PACKAGES := kmod-rtc-sunxi kmod-usb-net-rtl8152 kmod-leds-gpio \
-	kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-basic-wolfssl
+	kmod-brcmfmac cypress-firmware-43430-sdio wpad-basic-wolfssl
   SOC := sun8i-h3
 endef
 TARGET_DEVICES += friendlyarm_nanopi-r1
@@ -81,7 +81,7 @@ define Device/sinovoip_bananapi-m2-berry
   DEVICE_VENDOR := Sinovoip
   DEVICE_MODEL := Banana Pi M2 Berry
   DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-ata-sunxi kmod-brcmfmac \
-	brcmfmac-firmware-43430-sdio wpad-basic-wolfssl
+	cypress-firmware-43430-sdio wpad-basic-wolfssl
   SUPPORTED_DEVICES:=lemaker,bananapi-m2-berry
   SOC := sun8i-v40
 endef

More information about the lede-commits mailing list