From: Ben Greear <greearb@candelatech.com>
Date: Wed, 21 Mar 2018 17:29:00 +0000 (-0700)
Subject: ath10k-ct: Update DEPENDS and PROVIDES
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=375be15429d89a3b6fbac52b62ea85a122db5ec1;p=openwrt%2Fstaging%2Fnbd.git

ath10k-ct: Update DEPENDS and PROVIDES

Update DEPENDS and PROVIDES so that ath10k-ct firmware
and drivers can be used to replace stock firmware
and drivers.  The -htt firmware variant, which requires
ath10k-ct driver now selects ath10k-ct driver when the
firmware is selected.

Signed-off-by: Ben Greear <greearb@candelatech.com>
---

diff --git a/package/firmware/ath10k-firmware/Makefile b/package/firmware/ath10k-firmware/Makefile
index 78d01d9035..aa925a4dc1 100644
--- a/package/firmware/ath10k-firmware/Makefile
+++ b/package/firmware/ath10k-firmware/Makefile
@@ -125,6 +125,7 @@ $(Package/ath10k-firmware-default)
   TITLE:=ath10k CT 10.1 firmware for QCA988x devices
   SECTION:=firmware
   CATEGORY:=Firmware
+  PROVIDES:=ath10k-firmware-qca988x
 endef
 
 define Package/ath10k-firmware-qca9887-ct
@@ -132,6 +133,7 @@ $(Package/ath10k-firmware-default)
   TITLE:=ath10k CT 10.1 firmware for QCA9887 devices
   SECTION:=firmware
   CATEGORY:=Firmware
+  PROVIDES:=ath10k-firmware-qca9887
 endef
 
 define Package/ath10k-firmware-qca988x-ct/description
@@ -198,6 +200,7 @@ $(Package/ath10k-firmware-default)
   TITLE:=ath10k CT 10.4 firmware for QCA99x0 devices
   SECTION:=firmware
   CATEGORY:=Firmware
+  PROVIDES:=ath10k-firmware-qca99x0
 endef
 
 define Package/ath10k-firmware-qca9984-ct
@@ -205,6 +208,7 @@ $(Package/ath10k-firmware-default)
   TITLE:=ath10k CT 10.4 firmware for QCA9984 devices
   SECTION:=firmware
   CATEGORY:=Firmware
+  PROVIDES:=ath10k-firmware-qca9984
 endef
 
 define Package/ath10k-firmware-qca4019-ct-htt
@@ -212,12 +216,15 @@ $(Package/ath10k-firmware-default)
   TITLE:=ath10k CT 10.4 htt-mgt for QCA4018/9
   SECTION:=firmware
   CATEGORY:=Firmware
+  PROVIDES:=ath10k-firmware-qca4019
+  DEPENDS:=+kmod-ath10k-ct
 endef
 define Package/ath10k-firmware-qca4019-ct
 $(Package/ath10k-firmware-default)
   TITLE:=ath10k CT 10.4 firmware for QCA4018/9
   SECTION:=firmware
   CATEGORY:=Firmware
+  PROVIDES:=ath10k-firmware-qca4019
 endef
 
 define Package/ath10k-firmware-qca9888-ct
@@ -225,6 +232,7 @@ $(Package/ath10k-firmware-default)
   TITLE:=ath10k CT 10.4 fw for QCA9886/8 devices
   SECTION:=firmware
   CATEGORY:=Firmware
+  PROVIDES:=ath10k-firmware-qca9888
 endef
 
 define Package/ath10k-firmware-qca9984
diff --git a/package/kernel/ath10k-ct/Makefile b/package/kernel/ath10k-ct/Makefile
index 8f9a8dd70f..0e416aa8b5 100644
--- a/package/kernel/ath10k-ct/Makefile
+++ b/package/kernel/ath10k-ct/Makefile
@@ -34,6 +34,7 @@ define KernelPackage/ath10k-ct
 	$(PKG_BUILD_DIR)/ath10k$(CT_KVER)/ath10k_pci.ko \
 	$(PKG_BUILD_DIR)/ath10k$(CT_KVER)/ath10k_core.ko
   AUTOLOAD:=$(call AutoProbe,mac80211 ath ath10k_pci)
+  PROVIDES:=kmod-ath10k
 endef
 
 NOSTDINC_FLAGS = \