From: Álvaro Fernández Rojas <noltari@gmail.com>
Date: Wed, 25 Nov 2020 10:37:01 +0000 (+0100)
Subject: ath10k-ct-firmware: switch to linux-firmware board binaries
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=655091ec454a2cfe255bf0ae8e34490d641f8f50;p=openwrt%2Fstaging%2Fjow.git

ath10k-ct-firmware: switch to linux-firmware board binaries

Instead of duplicating board firmware binaries, which are exactly the same
as the ones from linux-firmware, add dependencies and remove duplicated
downloads.

Runtime-tested on ath79 (TP-Link Archer C7 v2) and ipq806x (Netgear R7800).

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---

diff --git a/package/firmware/ath10k-ct-firmware/Makefile b/package/firmware/ath10k-ct-firmware/Makefile
index cdfd3fb940..83e5563e64 100644
--- a/package/firmware/ath10k-ct-firmware/Makefile
+++ b/package/firmware/ath10k-ct-firmware/Makefile
@@ -2,77 +2,10 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ath10k-ct-firmware
 PKG_VERSION:=2020-07-02
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 include $(INCLUDE_DIR)/package.mk
 
-ATH10K_FIRMWARE_REV:=d622d160e9f552ead68d9ae81b715422892dc2ef
-ATH10K_FIRMWARE_URL:=@GITHUB/kvalo/ath10k-firmware/$(ATH10K_FIRMWARE_REV)
-
-QCA9887_BOARD_FILE:=ath10k-firmware-$(ATH10K_FIRMWARE_REV)-qca9887-board.bin
-define Download/qca9887-board
-  FILE:=$(QCA9887_BOARD_FILE)
-  URL:=$(ATH10K_FIRMWARE_URL)/QCA9887/hw1.0
-  URL_FILE:=board.bin
-  HASH:=cf4df099f6ee05c181f55ce17297a1d32c61d725eb96246fd315ad5587c42426
-endef
-$(eval $(call Download,qca9887-board))
-
-QCA988X_BOARD_FILE:=ath10k-firmware-$(ATH10K_FIRMWARE_REV)-qca988x-board.bin
-define Download/qca988x-board
-  FILE:=$(QCA988X_BOARD_FILE)
-  URL:=$(ATH10K_FIRMWARE_URL)/QCA988X/hw2.0
-  URL_FILE:=board.bin
-  HASH:=5b5b380333c2dd3b6ce67f30e2f7008f4020bf594970d3b464fd8d4a80fcd880
-endef
-$(eval $(call Download,qca988x-board))
-
-QCA99X0_BOARD_FILE:=ath10k-firmware-$(ATH10K_FIRMWARE_REV)-qca99x0-board.bin
-define Download/qca99x0-board
-  FILE:=$(QCA99X0_BOARD_FILE)
-  URL:=$(ATH10K_FIRMWARE_URL)/QCA99X0/hw2.0
-  URL_FILE:=boardData_AR900B_CUS239_5G_v2_001.bin
-  HASH:=3bf7561ee373b369025dcd366d276d038a97d3397ccae41ce841d98a58b30aff
-endef
-$(eval $(call Download,qca99x0-board))
-
-QCA99X0_BOARD2_REV:=ddcec9efd245da9365c474f513a855a55f3ac7fe
-QCA99X0_BOARD2_FILE:=ath10k-firmware-$(QCA99X0_BOARD2_REV)-qca99x0-board-2.bin
-define Download/qca99x0-board2
-  FILE:=$(QCA99X0_BOARD2_FILE)
-  URL:=https://source.codeaurora.org/quic/qsdk/oss/firmware/ath10k-firmware/plain/ath10k/QCA99X0/hw2.0
-  URL_FILE:=board-2.bin?id=$(QCA99X0_BOARD2_REV)
-  HASH:=03711ac21e60ef59d3815e235eb721c0c22851b5410299411085aa6f2af45401
-endef
-$(eval $(call Download,qca99x0-board2))
-
-QCA9984_BOARD2_FILE:=ath10k-firmware-$(ATH10K_FIRMWARE_REV)-qca9984-board-2.bin
-define Download/qca9984-board2
-  FILE:=$(QCA9984_BOARD2_FILE)
-  URL:=$(ATH10K_FIRMWARE_URL)/QCA9984/hw1.0
-  URL_FILE:=board-2.bin
-  HASH:=0d6d46cf0467185e3959ce3cb69e2415be6e48ab8a4bee3eb400edbe48cb9c25
-endef
-$(eval $(call Download,qca9984-board2))
-
-QCA4019_BOARD2_FILE:=ath10k-firmware-$(ATH10K_FIRMWARE_REV)-qca4019-board-2.bin
-define Download/qca4019-board2
-  FILE:=$(QCA4019_BOARD2_FILE)
-  URL:=$(ATH10K_FIRMWARE_URL)/QCA4019/hw1.0
-  URL_FILE:=board-2.bin
-  HASH:=94b66aa4ddbed5110a96364d3c7b4ebcb320e3ac4e8697660b277e76077bc338
-endef
-$(eval $(call Download,qca4019-board2))
-
-QCA9888_BOARD2_FILE:=ath10k-firmware-$(ATH10K_FIRMWARE_REV)-qca9888-board-2.bin
-define Download/qca9888-board2
-  FILE:=$(QCA9888_BOARD2_FILE)
-  URL:=$(ATH10K_FIRMWARE_URL)/QCA9888/hw2.0
-  URL_FILE:=board-2.bin
-  HASH:=5b871bb567f64525ca45adb88063211de472015d09e0f9aa3fa61ab71c8fdfd3
-endef
-$(eval $(call Download,qca9888-board2))
-
 CT_FIRMWARE_FILE = $(1)-$($(1)_FIRMWARE_FILE_CT)
 CT_FIRMWARE_FILE_FULL_HTT = $(1)-$($(1)_FIRMWARE_FILE_CT_FULL_HTT)
 CT_FIRMWARE_FILE_HTT = $(1)-$($(1)_FIRMWARE_FILE_CT_HTT)
@@ -227,6 +160,7 @@ $(Package/ath10k-ct-firmware-default)
   CATEGORY:=Firmware
   PROVIDES:=ath10k-firmware-qca988x
   CONFLICTS:=ath10k-firmware-qca988x
+  DEPENDS:=+ath10k-board-qca988x
 endef
 define Package/ath10k-firmware-qca988x-ct-full-htt
 $(Package/ath10k-ct-firmware-default)
@@ -239,7 +173,9 @@ $(Package/ath10k-ct-firmware-default)
   CONFLICTS:=\
     ath10k-firmware-qca988x \
     ath10k-firmware-qca988x-ct
-  DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
+  DEPENDS:=\
+    +ath10k-board-qca988x \
+    +!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
 endef
 
 define Package/ath10k-firmware-qca9887-ct
@@ -249,6 +185,7 @@ $(Package/ath10k-ct-firmware-default)
   CATEGORY:=Firmware
   PROVIDES:=ath10k-firmware-qca9887
   CONFLICTS:=ath10k-firmware-qca9887
+  DEPENDS:=+ath10k-board-qca9887
 endef
 define Package/ath10k-firmware-qca9887-ct-full-htt
 $(Package/ath10k-ct-firmware-default)
@@ -261,7 +198,9 @@ $(Package/ath10k-ct-firmware-default)
   CONFLICTS:=\
     ath10k-firmware-qca9887 \
     ath10k-firmware-qca9887-ct
-  DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
+  DEPENDS:=\
+    +ath10k-board-qca9887 \
+    +!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
 endef
 
 define Package/ath10k-firmware-qca99x0-ct
@@ -271,6 +210,7 @@ $(Package/ath10k-ct-firmware-default)
   CATEGORY:=Firmware
   PROVIDES:=ath10k-firmware-qca99x0
   CONFLICTS:=ath10k-firmware-qca99x0
+  DEPENDS:=+ath10k-board-qca99x0
 endef
 define Package/ath10k-firmware-qca99x0-ct-full-htt
 $(Package/ath10k-ct-firmware-default)
@@ -284,7 +224,9 @@ $(Package/ath10k-ct-firmware-default)
     ath10k-firmware-qca99x0 \
     ath10k-firmware-qca99x0-ct \
     ath10k-firmware-qca99x0-ct-htt
-  DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
+  DEPENDS:=\
+    +ath10k-board-qca99x0 \
+    +!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
 endef
 define Package/ath10k-firmware-qca99x0-ct-htt
 $(Package/ath10k-firmware-default)
@@ -297,7 +239,9 @@ $(Package/ath10k-firmware-default)
   CONFLICTS:=\
     ath10k-firmware-qca99x0 \
     ath10k-firmware-qca99x0-ct
-  DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
+  DEPENDS:=\
+    +ath10k-board-qca99x0 \
+    +!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
 endef
 
 define Package/ath10k-firmware-qca9984-ct
@@ -307,6 +251,7 @@ $(Package/ath10k-ct-firmware-default)
   CATEGORY:=Firmware
   PROVIDES:=ath10k-firmware-qca9984
   CONFLICTS:=ath10k-firmware-qca9984
+  DEPENDS:=+ath10k-board-qca9984
 endef
 define Package/ath10k-firmware-qca9984-ct-full-htt
 $(Package/ath10k-ct-firmware-default)
@@ -320,7 +265,9 @@ $(Package/ath10k-ct-firmware-default)
     ath10k-firmware-qca9984 \
     ath10k-firmware-qca9984-ct \
     ath10k-firmware-qca9984-ct-htt
-  DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
+  DEPENDS:=\
+    +ath10k-board-qca9984 \
+    +!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
 endef
 define Package/ath10k-firmware-qca9984-ct-htt
 $(Package/ath10k-firmware-default)
@@ -333,7 +280,9 @@ $(Package/ath10k-firmware-default)
   CONFLICTS:=\
     ath10k-firmware-qca9984 \
     ath10k-firmware-qca9984-ct
-  DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
+  DEPENDS:=\
+    +ath10k-board-qca9984 \
+    +!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
 endef
 
 define Package/ath10k-firmware-qca4019-ct
@@ -343,6 +292,7 @@ $(Package/ath10k-ct-firmware-default)
   CATEGORY:=Firmware
   PROVIDES:=ath10k-firmware-qca4019
   CONFLICTS:=ath10k-firmware-qca4019
+  DEPENDS:=+ath10k-board-qca4019
 endef
 define Package/ath10k-firmware-qca4019-ct-full-htt
 $(Package/ath10k-ct-firmware-default)
@@ -356,7 +306,9 @@ $(Package/ath10k-ct-firmware-default)
     ath10k-firmware-qca4019 \
     ath10k-firmware-qca4019-ct \
     ath10k-firmware-qca4019-ct-htt
-  DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
+  DEPENDS:=\
+    +ath10k-board-qca4019 \
+    +!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
 endef
 define Package/ath10k-firmware-qca4019-ct-htt
 $(Package/ath10k-firmware-default)
@@ -369,7 +321,9 @@ $(Package/ath10k-firmware-default)
   CONFLICTS:=\
     ath10k-firmware-qca4019 \
     ath10k-firmware-qca4019-ct
-  DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
+  DEPENDS:=\
+    +ath10k-board-qca4019 \
+    +!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
 endef
 
 define Package/ath10k-firmware-qca9888-ct
@@ -379,6 +333,7 @@ $(Package/ath10k-ct-firmware-default)
   CATEGORY:=Firmware
   PROVIDES:=ath10k-firmware-qca9888
   CONFLICTS:=ath10k-firmware-qca9888
+  DEPENDS:=+ath10k-board-qca9888
 endef
 define Package/ath10k-firmware-qca9888-ct-full-htt
 $(Package/ath10k-ct-firmware-default)
@@ -392,7 +347,9 @@ $(Package/ath10k-ct-firmware-default)
     ath10k-firmware-qca9888 \
     ath10k-firmware-qca9888-ct \
     ath10k-firmware-qca9888-ct-htt
-  DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
+  DEPENDS:=\
+    +ath10k-board-qca9888 \
+    +!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
 endef
 define Package/ath10k-firmware-qca9888-ct-htt
 $(Package/ath10k-firmware-default)
@@ -405,7 +362,9 @@ $(Package/ath10k-firmware-default)
   CONFLICTS:=\
     ath10k-firmware-qca9888 \
     ath10k-firmware-qca9888-ct
-  DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
+  DEPENDS:=\
+    +ath10k-board-qca9888 \
+    +!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
 endef
 
 
@@ -555,34 +514,22 @@ define Package/ath10k-firmware-qca9887-ct/install
 	$(INSTALL_DATA) \
 		$(DL_DIR)/$(call CT_FIRMWARE_FILE,QCA9887) \
 		$(1)/lib/firmware/ath10k/QCA9887/hw1.0/firmware-2.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA9887_BOARD_FILE) \
-		$(1)/lib/firmware/ath10k/QCA9887/hw1.0/board.bin
 endef
 define Package/ath10k-firmware-qca9887-ct-full-htt/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9887/hw1.0
 	$(INSTALL_DATA) \
 		$(DL_DIR)/$(call CT_FIRMWARE_FILE_FULL_HTT,QCA9887) \
 		$(1)/lib/firmware/ath10k/QCA9887/hw1.0/ct-firmware-2.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA9887_BOARD_FILE) \
-		$(1)/lib/firmware/ath10k/QCA9887/hw1.0/board.bin
 endef
 
 define Package/ath10k-firmware-qca988x-ct/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA988X/hw2.0
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA988X_BOARD_FILE) \
-		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/board.bin
 	$(INSTALL_DATA) \
 		$(DL_DIR)/$(call CT_FIRMWARE_FILE,QCA988X) \
 		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-2.bin
 endef
 define Package/ath10k-firmware-qca988x-ct-full-htt/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA988X/hw2.0
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA988X_BOARD_FILE) \
-		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/board.bin
 	$(INSTALL_DATA) \
 		$(DL_DIR)/$(call CT_FIRMWARE_FILE_FULL_HTT,QCA988X) \
 		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/ct-firmware-2.bin
@@ -590,36 +537,18 @@ endef
 
 define Package/ath10k-firmware-qca99x0-ct/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA99X0/hw2.0
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA99X0_BOARD2_FILE) \
-		$(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board-2.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA99X0_BOARD_FILE) \
-		$(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board.bin
 	$(INSTALL_DATA) \
 		$(DL_DIR)/$(call CT_FIRMWARE_FILE,QCA99X0) \
 		$(1)/lib/firmware/ath10k/QCA99X0/hw2.0/firmware-5.bin
 endef
 define Package/ath10k-firmware-qca99x0-ct-full-htt/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA99X0/hw2.0
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA99X0_BOARD2_FILE) \
-		$(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board-2.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA99X0_BOARD_FILE) \
-		$(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board.bin
 	$(INSTALL_DATA) \
 		$(DL_DIR)/$(call CT_FIRMWARE_FILE_FULL_HTT,QCA99X0) \
 		$(1)/lib/firmware/ath10k/QCA99X0/hw2.0/ct-firmware-5.bin
 endef
 define Package/ath10k-firmware-qca99x0-ct-htt/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA99X0/hw2.0
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA99X0_BOARD2_FILE) \
-		$(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board-2.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA99X0_BOARD_FILE) \
-		$(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board.bin
 	$(INSTALL_DATA) \
 		$(DL_DIR)/$(call CT_FIRMWARE_FILE_HTT,QCA99X0) \
 		$(1)/lib/firmware/ath10k/QCA99X0/hw2.0/ct-firmware-5.bin
@@ -627,27 +556,18 @@ endef
 
 define Package/ath10k-firmware-qca9984-ct/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9984/hw1.0
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA9984_BOARD2_FILE) \
-		$(1)/lib/firmware/ath10k/QCA9984/hw1.0/board-2.bin
 	$(INSTALL_DATA) \
 		$(DL_DIR)/$(call CT_FIRMWARE_FILE,QCA9984) \
 		$(1)/lib/firmware/ath10k/QCA9984/hw1.0/firmware-5.bin
 endef
 define Package/ath10k-firmware-qca9984-ct-full-htt/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9984/hw1.0
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA9984_BOARD2_FILE) \
-		$(1)/lib/firmware/ath10k/QCA9984/hw1.0/board-2.bin
 	$(INSTALL_DATA) \
 		$(DL_DIR)/$(call CT_FIRMWARE_FILE_FULL_HTT,QCA9984) \
 		$(1)/lib/firmware/ath10k/QCA9984/hw1.0/ct-firmware-5.bin
 endef
 define Package/ath10k-firmware-qca9984-ct-htt/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9984/hw1.0
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA9984_BOARD2_FILE) \
-		$(1)/lib/firmware/ath10k/QCA9984/hw1.0/board-2.bin
 	$(INSTALL_DATA) \
 		$(DL_DIR)/$(call CT_FIRMWARE_FILE_HTT,QCA9984) \
 		$(1)/lib/firmware/ath10k/QCA9984/hw1.0/ct-firmware-5.bin
@@ -655,27 +575,18 @@ endef
 
 define Package/ath10k-firmware-qca4019-ct/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA4019/hw1.0
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA4019_BOARD2_FILE) \
-		$(1)/lib/firmware/ath10k/QCA4019/hw1.0/board-2.bin
 	$(INSTALL_DATA) \
 		$(DL_DIR)/$(call CT_FIRMWARE_FILE,QCA4019) \
 		$(1)/lib/firmware/ath10k/QCA4019/hw1.0/firmware-5.bin
 endef
 define Package/ath10k-firmware-qca4019-ct-full-htt/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA4019/hw1.0
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA4019_BOARD2_FILE) \
-		$(1)/lib/firmware/ath10k/QCA4019/hw1.0/board-2.bin
 	$(INSTALL_DATA) \
 		$(DL_DIR)/$(call CT_FIRMWARE_FILE_FULL_HTT,QCA4019) \
 		$(1)/lib/firmware/ath10k/QCA4019/hw1.0/ct-firmware-5.bin
 endef
 define Package/ath10k-firmware-qca4019-ct-htt/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA4019/hw1.0
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA4019_BOARD2_FILE) \
-		$(1)/lib/firmware/ath10k/QCA4019/hw1.0/board-2.bin
 	$(INSTALL_DATA) \
 		$(DL_DIR)/$(call CT_FIRMWARE_FILE_HTT,QCA4019) \
 		$(1)/lib/firmware/ath10k/QCA4019/hw1.0/ct-firmware-5.bin
@@ -686,9 +597,6 @@ define Package/ath10k-firmware-qca9888-ct/install
 	ln -s \
 		../../cal-pci-0000:01:00.0.bin \
 		$(1)/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA9888_BOARD2_FILE) \
-		$(1)/lib/firmware/ath10k/QCA9888/hw2.0/board-2.bin
 	$(INSTALL_DATA) \
 		$(DL_DIR)/$(call CT_FIRMWARE_FILE,QCA9888) \
 		$(1)/lib/firmware/ath10k/QCA9888/hw2.0/firmware-5.bin
@@ -698,9 +606,6 @@ define Package/ath10k-firmware-qca9888-ct-full-htt/install
 	ln -s \
 		../../cal-pci-0000:01:00.0.bin \
 		$(1)/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA9888_BOARD2_FILE) \
-		$(1)/lib/firmware/ath10k/QCA9888/hw2.0/board-2.bin
 	$(INSTALL_DATA) \
 		$(DL_DIR)/$(call CT_FIRMWARE_FILE_FULL_HTT,QCA9888) \
 		$(1)/lib/firmware/ath10k/QCA9888/hw2.0/ct-firmware-5.bin
@@ -710,9 +615,6 @@ define Package/ath10k-firmware-qca9888-ct-htt/install
 	ln -s \
 		../../cal-pci-0000:01:00.0.bin \
 		$(1)/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
-	$(INSTALL_DATA) \
-		$(DL_DIR)/$(QCA9888_BOARD2_FILE) \
-		$(1)/lib/firmware/ath10k/QCA9888/hw2.0/board-2.bin
 	$(INSTALL_DATA) \
 		$(DL_DIR)/$(call CT_FIRMWARE_FILE_HTT,QCA9888) \
 		$(1)/lib/firmware/ath10k/QCA9888/hw2.0/ct-firmware-5.bin