X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Ffirmware%2Fath10k-firmware%2FMakefile;h=7e6098e94006069c1e67abc001cc501256a115f7;hb=8515deb60a1995b9237485209ec5f90f2ba8dcc7;hp=c15adc3bc19fb04e6001e9d4dc489dec8027b7c6;hpb=70011393a9027ddd8fd3c57af072161a5ed5d00b;p=openwrt%2Fstaging%2Fblogic.git

diff --git a/package/firmware/ath10k-firmware/Makefile b/package/firmware/ath10k-firmware/Makefile
index c15adc3bc19f..7e6098e94006 100644
--- a/package/firmware/ath10k-firmware/Makefile
+++ b/package/firmware/ath10k-firmware/Makefile
@@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ath10k-firmware
-PKG_SOURCE_VERSION:=b063774393b184c6e1626dec81cf5270cc213c69
-PKG_MIRROR_MD5SUM:=767c249578a4a2a14f202d92e1625af99153f29a5aeae14d04690d20c6b13897
-PKG_VERSION:=2016-09-13-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=fead2ed867af4e107265059b9f578179d7409867
+PKG_MIRROR_HASH:=47d6eb651c08e17772ed03451740ea7d73288b629385c0bd58c14a8675d2f89a
+PKG_VERSION:=2016-12-15-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
@@ -36,17 +36,17 @@ endef
 
 QCA9887_REV:=3cce88e245f2d685e49411c4f80998f94baf67b8
 QCA9887_FIRMWARE_FILE:=firmware-5.bin_10.2.4-1.0-00013
-QCA9887_FIRMWARE_FILE_MD5:=bd9cdcbf49561c7176432a81c29e7e87
+QCA9887_FIRMWARE_FILE_HASH:=5966408bd41f309edb595344b8dd088c0fed212debfd91e5f3e8a55ea119c16d
 QCA9887_FIRMWARE_FILE_DL:=$(QCA9887_FIRMWARE_FILE).$(QCA9887_FIRMWARE_FILE_MD5)
 QCA9887_BOARD_FILE:=board.bin
-QCA9887_BOARD_FILE_MD5:=ebf3af10160c45373f19e0b8226b02ae
+QCA9887_BOARD_FILE_HASH:=cf4df099f6ee05c181f55ce17297a1d32c61d725eb96246fd315ad5587c42426
 QCA9887_BOARD_FILE_DL:=$(QCA9887_BOARD_FILE).$(QCA9887_BOARD_FILE_MD5)
 
 define Download/ath10k-qca9887-firmware
   URL:=https://github.com/kvalo/ath10k-firmware/raw/$(QCA9887_REV)/QCA9887/hw1.0/
   URL_FILE:=$(QCA9887_FIRMWARE_FILE)
   FILE:=$(QCA9887_FIRMWARE_FILE_DL)
-  MD5SUM:=$(QCA9887_FIRMWARE_FILE_MD5)
+  HASH:=$(QCA9887_FIRMWARE_FILE_HASH)
 endef
 $(eval $(call Download,ath10k-qca9887-firmware))
 
@@ -54,7 +54,7 @@ define Download/ath10k-qca9887-board
   URL:=https://github.com/kvalo/ath10k-firmware/raw/$(QCA9887_REV)/QCA9887/hw1.0/
   URL_FILE:=$(QCA9887_BOARD_FILE)
   FILE:=$(QCA9887_BOARD_FILE_DL)
-  MD5SUM:=$(QCA9887_BOARD_FILE_MD5)
+  HASH:=$(QCA9887_BOARD_FILE_HASH)
 endef
 $(eval $(call Download,ath10k-qca9887-board))
 
@@ -66,28 +66,32 @@ $(Package/ath10k-firmware-default)
   CATEGORY:=Firmware
 endef
 
-QCA988X_FIRMWARE_FILE_CT:=firmware-2-ct-full-community.bin-18.rc2-lede
-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
+CT_FIRMWARE_FILE = $(1)-$($(1)_FIRMWARE_FILE_CT)
+
+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
-  URL:=https://www.candelatech.com/downloads/
-  FILE:=$(QCA988X_FIRMWARE_FILE_CT)
-  MD5SUM:=665482e1fd20a410627996c9a0b93411
+  $(call Download/ct-firmware,QCA988X,)
+  HASH:=43ee2cdde42b765671152d6491e5e6730ad57290baea3412f2b1b75a73563b23
 endef
 $(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
-  URL:=https://www.candelatech.com/downloads/ath10k-10-4/
-  FILE:=$(QCA99X0_FIRMWARE_FILE_CT)
-  MD5SUM:=a63d9651e884bbb38ed6ff722f6c6951
+  $(call Download/ct-firmware,QCA99X0,ath10k-10-4)
+  HASH:=e6c69d82439eee49cea9dd34bb0198733e9c46d6405e714f47882dd3e48baed3
 endef
 $(eval $(call Download,ath10k-firmware-qca99x0-ct))
 
+QCA9984_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-8.bin-lede.005
 define Download/ath10k-firmware-qca9984-ct
-  URL:=https://www.candelatech.com/downloads/ath10k-9984-10-4/
-  FILE:=$(QCA9984_FIRMWARE_FILE_CT)
-  MD5SUM:=b2427376dbfdb083b3d27cf42b2c525d
+  $(call Download/ct-firmware,QCA9984,ath10k-9984-10-4)
+  HASH:=0c935362f25a164c71328c52c57ac25834cc04c6a3e13eddb3c0a7473615347d
 endef
 $(eval $(call Download,ath10k-firmware-qca9984-ct))
 
@@ -125,7 +129,7 @@ endef
 define Package/ath10k-firmware-qca9984-ct/description
 Alternative ath10k firmware for QCA9984 from Candela Technologies.
 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
 one.
 endef
@@ -171,7 +175,7 @@ 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)
   FILE:=$(QCA99X0_BOARD_FILE)
-  MD5SUM:=a2b3c653c2363a5641200051d6333d0a
+  HASH:=03711ac21e60ef59d3815e235eb721c0c22851b5410299411085aa6f2af45401
 endef
 $(eval $(call Download,qca99x0-board))
 
@@ -195,7 +199,7 @@ define Package/ath10k-firmware-qca988x/install
 		$(PKG_BUILD_DIR)/QCA988X/hw2.0/board.bin \
 		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/
 	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/QCA988X/hw2.0/10.2.4.70/firmware-5.bin_10.2.4.70.54 \
+		$(PKG_BUILD_DIR)/QCA988X/hw2.0/10.2.4.70/firmware-5.bin_10.2.4.70.59-2 \
 		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-5.bin
 endef
 
@@ -205,7 +209,7 @@ define Package/ath10k-firmware-qca988x-ct/install
 		$(PKG_BUILD_DIR)/QCA988X/hw2.0/board.bin \
 		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/
 	$(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
 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 \
 		$(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board.bin
 	$(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
 endef
 
@@ -262,7 +266,7 @@ define Package/ath10k-firmware-qca9984-ct/install
 		$(PKG_BUILD_DIR)/QCA9984/hw1.0/board-2.bin \
 		$(1)/lib/firmware/ath10k/QCA9984/hw1.0/board-2.bin
 	$(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
 endef