From 85c7356c73d568af89b3dfc7c7392773429c5c10 Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Fri, 18 Oct 2019 01:37:20 -0700 Subject: [PATCH] linux-firmware: fix raspberrypi 3/4 no-wifi issue --- package/firmware/linux-firmware/Makefile | 6 +++--- package/firmware/linux-firmware/broadcom.mk | 2 ++ package/firmware/linux-firmware/intel.mk | 6 +++--- package/firmware/linux-firmware/mediatek.mk | 9 +++++++++ 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/package/firmware/linux-firmware/Makefile b/package/firmware/linux-firmware/Makefile index 137ff2bc9..ac4c3d4a6 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:=20190416 +PKG_VERSION:=20190815 PKG_RELEASE:=1 PKG_SOURCE_URL:=@KERNEL/linux/kernel/firmware PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_HASH:=4851120ea69436fd5088fc72674798ad343c5ddb89ac6b4161225357d1eda08c +PKG_HASH:=15615d87ac9d93aa5c20939a6c65cca7f3bc656b5e8ffd998b8acb932c854327 PKG_MAINTAINER:=Felix Fietkau @@ -33,4 +33,4 @@ define Build/Compile endef include $(wildcard ./*.mk) -#$(eval $(call BuildPackage,linux-firmware)) \ No newline at end of file +#$(eval $(call BuildPackage,linux-firmware)) diff --git a/package/firmware/linux-firmware/broadcom.mk b/package/firmware/linux-firmware/broadcom.mk index 2bdcd6d0a..4f7492a2d 100644 --- a/package/firmware/linux-firmware/broadcom.mk +++ b/package/firmware/linux-firmware/broadcom.mk @@ -103,6 +103,8 @@ define Package/brcmfmac-firmware-43455-sdio-rpi-4b/install $(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' \ + $(1)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt endef $(eval $(call BuildPackage,brcmfmac-firmware-43455-sdio-rpi-4b)) diff --git a/package/firmware/linux-firmware/intel.mk b/package/firmware/linux-firmware/intel.mk index 401ab1aa7..923701c70 100644 --- a/package/firmware/linux-firmware/intel.mk +++ b/package/firmware/linux-firmware/intel.mk @@ -73,7 +73,7 @@ $(eval $(call BuildPackage,iwlwifi-firmware-iwl3160)) Package/iwlwifi-firmware-iwl3168 = $(call Package/firmware-default,Intel Wireless 3168 firmware) define Package/iwlwifi-firmware-iwl3168/install $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-3168-27.ucode $(1)/lib/firmware + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-3168-29.ucode $(1)/lib/firmware endef $(eval $(call BuildPackage,iwlwifi-firmware-iwl3168)) @@ -157,14 +157,14 @@ $(eval $(call BuildPackage,iwlwifi-firmware-iwl8265)) Package/iwlwifi-firmware-iwl9000 = $(call Package/firmware-default,Intel Wireless 9000 firmware) define Package/iwlwifi-firmware-iwl9000/install $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-9000-pu-b0-jf-b0-38.ucode $(1)/lib/firmware + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-9000-pu-b0-jf-b0-46.ucode $(1)/lib/firmware endef $(eval $(call BuildPackage,iwlwifi-firmware-iwl9000)) Package/iwlwifi-firmware-iwl9260 = $(call Package/firmware-default,Intel Wireless 9260 firmware) define Package/iwlwifi-firmware-iwl9260/install $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-9260-th-b0-jf-b0-38.ucode $(1)/lib/firmware + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-9260-th-b0-jf-b0-46.ucode $(1)/lib/firmware endef $(eval $(call BuildPackage,iwlwifi-firmware-iwl9260)) diff --git a/package/firmware/linux-firmware/mediatek.mk b/package/firmware/linux-firmware/mediatek.mk index b258551a0..18677bc74 100644 --- a/package/firmware/linux-firmware/mediatek.mk +++ b/package/firmware/linux-firmware/mediatek.mk @@ -41,3 +41,12 @@ define Package/rt73-usb-firmware/install $(INSTALL_DATA) $(PKG_BUILD_DIR)/rt73.bin $(1)/lib/firmware/ endef $(eval $(call BuildPackage,rt73-usb-firmware)) + +Package/mt7622bt-firmware = $(call Package/firmware-default,mt7622bt firmware) +define Package/mt7622bt-firmware/install + $(INSTALL_DIR) $(1)/lib/firmware/mediatek + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/mediatek/mt7622pr2h.bin \ + $(1)/lib/firmware/mediatek +endef +$(eval $(call BuildPackage,mt7622bt-firmware))