From patchwork Wed Mar 21 17:29:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 888951 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=candelatech.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="XJgm77aR"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 405xdR4Rhhz9s0p for ; Thu, 22 Mar 2018 04:30:03 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=y+NcG9e10wBPvYWVaw+jpZ0C61mWVatiCO3WdKHElcc=; b=XJgm77aRTga3+O 4AM4kYDAY6JqzziVk6NUpqJUmhRFLWYouwLtvyPJkTWI2wd5XnHiBdI2b0cMt3INm5UaCpL0UWDwD d6MxpOSWiGS90Xt36tCea0AJlG9+p39iNqzQuqk6qkRo1DIqtXj+izPtGvzqAsjksyhb3z4ujRcel bH0Z3V05y6NTzCZsg6gSq7GrcDa0SpgYng22XnGgfUGYQ//MEvQm+sv+CIcsy9+/RiZwkQI58zHQa 2wTAZFmF3ZfH07sxWm+ETqSFTWq2QY6bZolOvg63PfkfjUrg9aY3//QWaoTe/j/YaaPvhfw8Whgon ySkeCRZ+V1gu58i6If0Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1eyhYh-0006O7-Ji; Wed, 21 Mar 2018 17:29:55 +0000 Received: from mail2.candelatech.com ([208.74.158.173]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1eyhYB-00069x-It for lede-dev@lists.infradead.org; Wed, 21 Mar 2018 17:29:25 +0000 Received: from ben-dt3.candelatech.com (firewall.candelatech.com [50.251.239.81]) by mail2.candelatech.com (Postfix) with ESMTP id 3039E40A626; Wed, 21 Mar 2018 10:29:09 -0700 (PDT) From: greearb@candelatech.com To: lede-dev@lists.infradead.org Date: Wed, 21 Mar 2018 10:29:00 -0700 Message-Id: <1521653343-4317-4-git-send-email-greearb@candelatech.com> X-Mailer: git-send-email 2.4.11 In-Reply-To: <1521653343-4317-1-git-send-email-greearb@candelatech.com> References: <1521653343-4317-1-git-send-email-greearb@candelatech.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180321_102923_791354_6D898BCF X-CRM114-Status: UNSURE ( 8.54 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record Subject: [LEDE-DEV] [PATCH v3 4/7] ath10k-ct: Update DEPENDS and PROVIDES X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ben Greear MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Ben Greear 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 --- package/firmware/ath10k-firmware/Makefile | 8 ++++++++ package/kernel/ath10k-ct/Makefile | 1 + 2 files changed, 9 insertions(+) diff --git a/package/firmware/ath10k-firmware/Makefile b/package/firmware/ath10k-firmware/Makefile index 78d01d9..aa925a4 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 8f9a8dd..0e416aa 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 = \