[openwrt/openwrt] linux-firmware: brcm: use RPI 4B NVRAM file

[LEDE Commits]

noltari pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/2418657104e5e0056d76b1840d1b2dba8db43127

commit 2418657104e5e0056d76b1840d1b2dba8db43127
Author: Álvaro Fernández Rojas <noltari at gmail.com>
AuthorDate: Wed Nov 25 10:37:24 2020 +0100

    linux-firmware: brcm: use RPI 4B NVRAM file
    
    Use the dedicated RPI 4B NVRAM file introduced in 20191215.
    
    Signed-off-by: Álvaro Fernández Rojas <noltari at gmail.com>
---
 package/firmware/linux-firmware/Makefile    | 2 +-
 package/firmware/linux-firmware/broadcom.mk | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/package/firmware/linux-firmware/Makefile b/package/firmware/linux-firmware/Makefile
index 799ee60a8f..877a58d3d6 100644
--- a/package/firmware/linux-firmware/Makefile
+++ b/package/firmware/linux-firmware/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=linux-firmware
 PKG_VERSION:=20201118
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_URL:=@KERNEL/linux/kernel/firmware
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
diff --git a/package/firmware/linux-firmware/broadcom.mk b/package/firmware/linux-firmware/broadcom.mk
index 4f7492a2d8..00f7076104 100644
--- a/package/firmware/linux-firmware/broadcom.mk
+++ b/package/firmware/linux-firmware/broadcom.mk
@@ -101,9 +101,7 @@ Package/brcmfmac-firmware-43455-sdio-rpi-4b = $(call Package/firmware-default,Br
 define Package/brcmfmac-firmware-43455-sdio-rpi-4b/install
 	$(INSTALL_DIR) $(1)/lib/firmware/brcm
 	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt \
-		$(1)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt
-	$(SED) 's/boardflags3=.*/boardflags3=0x44200100/g' \
+		$(PKG_BUILD_DIR)/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt \
 		$(1)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt
 endef
 $(eval $(call BuildPackage,brcmfmac-firmware-43455-sdio-rpi-4b))