hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ath10k-firmware: untangle CT firmware filenames, fix conflicts 

CT firmware files use the same filename with a different URL for
different chips. Since all files end up in dl/, filenames need to be
unique as well.
Add a chip prefix to the output filename to fix this issue.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
owl
Felix Fietkau 2016-12-16 14:36:53 +01:00
parent 7416d2e046
commit 7747fac375
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
package/firmware/ath10k-firmware/Makefile
View File

@ -66,27 +66,31 @@ $(Package/ath10k-firmware-default)
CATEGORY:=Firmware CATEGORY:=Firmware
endef endef
QCA988X_FIRMWARE_FILE_CT:=firmware-2-ct-full-community.bin-18.rc2-lede CT_FIRMWARE_FILE = $(1)-$($(1)_FIRMWARE_FILE_CT)
QCA99X0_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-8.bin-lede.005
QCA9984_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-8.bin-lede.005
define Download/ct-firmware
URL:=https://www.candelatech.com/downloads/$(2)
FILE:=$(call CT_FIRMWARE_FILE,$(1))
URL_FILE:=$($(1)_FIRMWARE_FILE_CT)
endef
QCA988X_FIRMWARE_FILE_CT:=firmware-2-ct-full-community.bin-18.rc2-lede
define Download/ath10k-firmware-qca988x-ct define Download/ath10k-firmware-qca988x-ct
URL:=https://www.candelatech.com/downloads/ $(call Download/ct-firmware,QCA988X,)
FILE:=$(QCA988X_FIRMWARE_FILE_CT)
MD5SUM:=665482e1fd20a410627996c9a0b93411 MD5SUM:=665482e1fd20a410627996c9a0b93411
endef endef
$(eval $(call Download,ath10k-firmware-qca988x-ct)) $(eval $(call Download,ath10k-firmware-qca988x-ct))
QCA99X0_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-8.bin-lede.005
define Download/ath10k-firmware-qca99x0-ct define Download/ath10k-firmware-qca99x0-ct
URL:=https://www.candelatech.com/downloads/ath10k-10-4/ $(call Download/ct-firmware,QCA99X0,ath10k-10-4)
FILE:=$(QCA99X0_FIRMWARE_FILE_CT)
MD5SUM:=a63d9651e884bbb38ed6ff722f6c6951 MD5SUM:=a63d9651e884bbb38ed6ff722f6c6951
endef endef
$(eval $(call Download,ath10k-firmware-qca99x0-ct)) $(eval $(call Download,ath10k-firmware-qca99x0-ct))
QCA9984_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-8.bin-lede.006
define Download/ath10k-firmware-qca9984-ct define Download/ath10k-firmware-qca9984-ct
URL:=https://www.candelatech.com/downloads/ath10k-9984-10-4/ $(call Download/ct-firmware,QCA9984,ath10k-9984-10-4)
FILE:=$(QCA9984_FIRMWARE_FILE_CT)
MD5SUM:=b2427376dbfdb083b3d27cf42b2c525d MD5SUM:=b2427376dbfdb083b3d27cf42b2c525d
endef endef
$(eval $(call Download,ath10k-firmware-qca9984-ct)) $(eval $(call Download,ath10k-firmware-qca9984-ct))
@ -125,7 +129,7 @@ endef
define Package/ath10k-firmware-qca9984-ct/description define Package/ath10k-firmware-qca9984-ct/description
Alternative ath10k firmware for QCA9984 from Candela Technologies. Alternative ath10k firmware for QCA9984 from Candela Technologies.
Enables IBSS and other features. See: Enables IBSS and other features. See:
http://www.candelatech.com/ath10k-10.4-9984.php http://www.candelatech.com/ath10k-10.4.php
This firmware conflicts with the standard 9984 firmware, so select only This firmware conflicts with the standard 9984 firmware, so select only
one. one.
endef endef
@ -205,7 +209,7 @@ define Package/ath10k-firmware-qca988x-ct/install
$(PKG_BUILD_DIR)/QCA988X/hw2.0/board.bin \ $(PKG_BUILD_DIR)/QCA988X/hw2.0/board.bin \
$(1)/lib/firmware/ath10k/QCA988X/hw2.0/ $(1)/lib/firmware/ath10k/QCA988X/hw2.0/
$(INSTALL_DATA) \ $(INSTALL_DATA) \
$(DL_DIR)/$(QCA988X_FIRMWARE_FILE_CT) \ $(DL_DIR)/$(call CT_FIRMWARE_FILE,QCA988X) \
$(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-2.bin $(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-2.bin
endef endef
@ -236,7 +240,7 @@ define Package/ath10k-firmware-qca99x0-ct/install
$(PKG_BUILD_DIR)/QCA99X0/hw2.0/boardData_AR900B_CUS239_5G_v2_001.bin \ $(PKG_BUILD_DIR)/QCA99X0/hw2.0/boardData_AR900B_CUS239_5G_v2_001.bin \
$(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board.bin $(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board.bin
$(INSTALL_DATA) \ $(INSTALL_DATA) \
$(DL_DIR)/$(QCA99X0_FIRMWARE_FILE_CT) \ $(DL_DIR)/$(call CT_FIRMWARE_FILE,QCA99X0) \
$(1)/lib/firmware/ath10k/QCA99X0/hw2.0/firmware-5.bin $(1)/lib/firmware/ath10k/QCA99X0/hw2.0/firmware-5.bin
endef endef
@ -262,7 +266,7 @@ define Package/ath10k-firmware-qca9984-ct/install
$(PKG_BUILD_DIR)/QCA9984/hw1.0/board-2.bin \ $(PKG_BUILD_DIR)/QCA9984/hw1.0/board-2.bin \
$(1)/lib/firmware/ath10k/QCA9984/hw1.0/board-2.bin $(1)/lib/firmware/ath10k/QCA9984/hw1.0/board-2.bin
$(INSTALL_DATA) \ $(INSTALL_DATA) \
$(DL_DIR)/$(QCA9984_FIRMWARE_FILE_CT) \ $(DL_DIR)/$(call CT_FIRMWARE_FILE,QCA9984) \
$(1)/lib/firmware/ath10k/QCA9984/hw1.0/firmware-5.bin $(1)/lib/firmware/ath10k/QCA9984/hw1.0/firmware-5.bin
endef endef