diff --git a/package/firmware/ath11k-firmware/Makefile b/package/firmware/ath11k-firmware/Makefile index 93829309b..7c0653809 100644 --- a/package/firmware/ath11k-firmware/Makefile +++ b/package/firmware/ath11k-firmware/Makefile @@ -7,9 +7,6 @@ include $(TOPDIR)/rules.mk -RSTRIP:=: -STRIP:=: - PKG_NAME:=ath11k-firmware PKG_SOURCE_DATE:=2022-11-25 PKG_SOURCE_VERSION:=9f285fbc1f7040d0ca6480926d1922b479e2d839 @@ -40,21 +37,11 @@ $(Package/ath11k-firmware-default) TITLE:=ath11k firmware for IPQ8074 devices endef -define Package/ath11k-firmware-qca6390 -$(Package/ath11k-firmware-default) - TITLE:=ath11k firmware for QCA6390 devices -endef - define Package/ath11k-firmware-qcn9074 $(Package/ath11k-firmware-default) TITLE:=ath11k firmware for QCN9074 devices endef -define Package/ath11k-firmware-wcn6855 -$(Package/ath11k-firmware-default) - TITLE:=ath11k firmware for WCN6855 devices -endef - define Build/Compile endef @@ -81,16 +68,6 @@ define Package/ath11k-firmware-ipq8074/install $(1)/lib/firmware/IPQ8074/ endef -define Package/ath11k-firmware-qca6390/install - $(INSTALL_DIR) $(1)/lib/firmware/ath11k/QCA6390/hw2.0 - $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/QCA6390/hw2.0/1.0.1/WLAN.HST.1.0.1-05266-QCAHSTSWPLZ_V2_TO_X86-1/* \ - $(1)/lib/firmware/ath11k/QCA6390/hw2.0/ - $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/QCA6390/hw2.0/board-2.bin \ - $(1)/lib/firmware/ath11k/QCA6390/hw2.0/board-2.bin -endef - define Package/ath11k-firmware-qcn9074/install $(INSTALL_DIR) $(1)/lib/firmware/ath11k/QCN9074/hw1.0 $(INSTALL_DATA) \ @@ -98,22 +75,6 @@ define Package/ath11k-firmware-qcn9074/install $(1)/lib/firmware/ath11k/QCN9074/hw1.0/ endef -define Package/ath11k-firmware-wcn6855/install - $(INSTALL_DIR) $(1)/lib/firmware/ath11k/WCN6855/hw2.0 - $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/WCN6855/hw2.0/1.1/WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.16/* \ - $(1)/lib/firmware/ath11k/WCN6855/hw2.0/ - $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/WCN6855/hw2.0/board-2.bin \ - $(1)/lib/firmware/ath11k/WCN6855/hw2.0/board-2.bin - $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/WCN6855/hw2.0/regdb.bin \ - $(1)/lib/firmware/ath11k/WCN6855/hw2.0/regdb.bin - $(LN) ./hw2.0 $(1)/lib/firmware/ath11k/WCN6855/hw2.1 -endef - $(eval $(call BuildPackage,ath11k-firmware-ipq6018)) $(eval $(call BuildPackage,ath11k-firmware-ipq8074)) -$(eval $(call BuildPackage,ath11k-firmware-qca6390)) $(eval $(call BuildPackage,ath11k-firmware-qcn9074)) -$(eval $(call BuildPackage,ath11k-firmware-wcn6855)) diff --git a/package/firmware/linux-firmware/Makefile b/package/firmware/linux-firmware/Makefile index 6c5ff542a..2c4d36101 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:=20221109 -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/qca_ath11k.mk b/package/firmware/linux-firmware/qca_ath11k.mk new file mode 100644 index 000000000..3e997bc3f --- /dev/null +++ b/package/firmware/linux-firmware/qca_ath11k.mk @@ -0,0 +1,23 @@ +Package/ath11k-firmware-qca6390 = $(call Package/firmware-default,QCA6390 ath11k firmware) +define Package/ath11k-firmware-qca6390/install + $(INSTALL_DIR) $(1)/lib/firmware/ath11k/QCA6390/hw2.0 + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/ath11k/QCA6390/hw2.0/* $(1)/lib/firmware/ath11k/QCA6390/hw2.0/ +endef +$(eval $(call BuildPackage,ath11k-firmware-qca6390)) + +Package/ath11k-firmware-wcn6750 = $(call Package/firmware-default,WCN6750 ath11k firmware) +define Package/ath11k-firmware-wcn6750/install + $(INSTALL_DIR) $(1)/lib/firmware/ath11k/WCN6750/hw1.0 + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/ath11k/WCN6750/hw1.0/* $(1)/lib/firmware/ath11k/WCN6750/hw1.0/ +endef +$(eval $(call BuildPackage,ath11k-firmware-wcn6750)) + +Package/ath11k-firmware-wcn6855 = $(call Package/firmware-default,WCN6855 ath11k firmware) +define Package/ath11k-firmware-wcn6855/install + $(INSTALL_DIR) $(1)/lib/firmware/ath11k/WCN6855/hw2.0 + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/ath11k/WCN6855/hw2.0/* $(1)/lib/firmware/ath11k/WCN6855/hw2.0/ +endef +$(eval $(call BuildPackage,ath11k-firmware-wcn6855)) diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk index 89b07470a..0e8c3fe5f 100644 --- a/package/kernel/linux/modules/netsupport.mk +++ b/package/kernel/linux/modules/netsupport.mk @@ -1356,7 +1356,7 @@ define KernelPackage/qrtr SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=Qualcomm IPC Router support HIDDEN:=1 - DEPENDS:=@(LINUX_5_15||LINUX_6_1) + DEPENDS:=@!(LINUX_5_4||LINUX_5_10) KCONFIG:=CONFIG_QRTR FILES:= \ $(LINUX_DIR)/net/qrtr/qrtr.ko \ @@ -1403,7 +1403,7 @@ $(eval $(call KernelPackage,qrtr-smd)) define KernelPackage/qrtr-mhi SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=MHI IPC Router channels - DEPENDS:=+kmod-mhi +kmod-qrtr + DEPENDS:=+kmod-mhi-bus +kmod-qrtr KCONFIG:=CONFIG_QRTR_MHI FILES:= $(LINUX_DIR)/net/qrtr/qrtr-mhi.ko AUTOLOAD:=$(call AutoProbe,qrtr-mhi)