From c2630ac910febd0be4ab8dc41f2aa7bda55e19f4 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Thu, 3 Feb 2022 23:15:36 +0100 Subject: [PATCH] linux-firmware: qca99x0 update package Kalle Valo ath10k-firmware repository no longer provides the legacy board.bin files for the qca99x0 chips. Instead he copied over the codeaurora version and add more board files. In the future, this board-2.bin should find its way to linux-firmware.git, which would allow us to remove the extra download code completely. Signed-off-by: Christian Lamparter --- package/firmware/linux-firmware/Makefile | 2 +- package/firmware/linux-firmware/qca_ath10k.mk | 45 ++----------------- 2 files changed, 5 insertions(+), 42 deletions(-) diff --git a/package/firmware/linux-firmware/Makefile b/package/firmware/linux-firmware/Makefile index 4786751e8cf..e46c8870f10 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:=20211216 -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_ath10k.mk b/package/firmware/linux-firmware/qca_ath10k.mk index d2c709af7ac..e6beef791ba 100644 --- a/package/firmware/linux-firmware/qca_ath10k.mk +++ b/package/firmware/linux-firmware/qca_ath10k.mk @@ -1,30 +1,14 @@ -QCA99X0_BOARD_REV:=ddcec9efd245da9365c474f513a855a55f3ac7fe +QCA99X0_BOARD_REV:=e404444dfc0baf7d0fcde21ab8ec333608c9960c QCA99X0_BOARD_FILE:=board-2.bin.$(QCA99X0_BOARD_REV) define Download/qca99x0-board - URL:=https://source.codeaurora.org/quic/qsdk/oss/firmware/ath10k-firmware/plain/ath10k/QCA99X0/hw2.0 - URL_FILE:=board-2.bin?id=$(QCA99X0_BOARD_REV) + URL:=https://github.com/kvalo/ath10k-firmware/raw/master/QCA99X0/hw2.0/ + URL_FILE:=board-2.bin FILE:=$(QCA99X0_BOARD_FILE) - HASH:=03711ac21e60ef59d3815e235eb721c0c22851b5410299411085aa6f2af45401 + HASH:=f91975dca2435fa6f8570146e6b255c2a70b9ffbdf5ef16a29d67bec7374c11a endef $(eval $(call Download,qca99x0-board)) -define Download/qca99x0-board-5g - URL:=https://github.com/kvalo/ath10k-firmware/raw/master/QCA99X0/hw2.0/ - URL_FILE:=boardData_AR900B_CUS239_5G_v2_001.bin - FILE:=boardData_AR900B_CUS239_5G_v2_001.bin - HASH:=3bf7561ee373b369025dcd366d276d038a97d3397ccae41ce841d98a58b30aff -endef -$(eval $(call Download,qca99x0-board-5g)) - -define Download/qca99x0-board-2g - URL:=https://github.com/kvalo/ath10k-firmware/raw/master/QCA99X0/hw2.0/ - URL_FILE:=boardData_AR900B_CUS260_2G_v2_002.bin - FILE:=boardData_AR900B_CUS260_2G_v2_002.bin - HASH:=fd91ddf93a271633c28fb1831a1dc5e829c345fbf2aa8980e816585cf9b9e9ed -endef -$(eval $(call Download,qca99x0-board-2g)) - Package/ath10k-board-qca4019 = $(call Package/firmware-default,ath10k qca4019 board firmware) define Package/ath10k-board-qca4019/install $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA4019/hw1.0 @@ -135,30 +119,9 @@ define Package/ath10k-board-qca99x0/install $(INSTALL_DATA) \ $(DL_DIR)/$(QCA99X0_BOARD_FILE) \ $(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board-2.bin - $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/ath10k/QCA99X0/hw2.0/board.bin \ - $(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board.bin endef $(eval $(call BuildPackage,ath10k-board-qca99x0)) -Package/ath10k-board-qca99x0-2g = $(call Package/firmware-default,ath10k qca99x0 board 2g precal firmware) -define Package/ath10k-board-qca99x0-2g/install - $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA99X0/hw2.0 - $(INSTALL_DATA) \ - $(DL_DIR)/boardData_AR900B_CUS260_2G_v2_002.bin \ - $(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board-2g-precal.bin -endef -$(eval $(call BuildPackage,ath10k-board-qca99x0-2g)) - -Package/ath10k-board-qca99x0-5g = $(call Package/firmware-default,ath10k qca99x0 board 5g precal firmware) -define Package/ath10k-board-qca99x0-5g/install - $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA99X0/hw2.0 - $(INSTALL_DATA) \ - $(DL_DIR)/boardData_AR900B_CUS239_5G_v2_001.bin \ - $(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board-5g-precal.bin -endef -$(eval $(call BuildPackage,ath10k-board-qca99x0-5g)) - Package/ath10k-firmware-qca99x0 = $(call Package/firmware-default,ath10k qca99x0 firmware,+ath10k-board-qca99x0) define Package/ath10k-firmware-qca99x0/install $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA99X0/hw2.0 -- 2.30.2