| Message ID | 1478714571-4841-1-git-send-email-bjorn.andersson@linaro.org (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Kalle Valo |
| Headers | show |
Hi Bjorn, > In the case SMD or WCNSS_CTRL are compiled as modules, wcn36xx must be > compiled as module as well, so we need to mention this dependency. > But we still want allow the driver to be compiled in case either of > those are =n, for compile testing reasons. > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> > --- > drivers/net/wireless/ath/wcn36xx/Kconfig | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/net/wireless/ath/wcn36xx/Kconfig b/drivers/net/wireless/ath/wcn36xx/Kconfig > index 591ebaea8265..4b83e87f0b94 100644 > --- a/drivers/net/wireless/ath/wcn36xx/Kconfig > +++ b/drivers/net/wireless/ath/wcn36xx/Kconfig > @@ -1,6 +1,8 @@ > config WCN36XX > tristate "Qualcomm Atheros WCN3660/3680 support" > depends on MAC80211 && HAS_DMA > + depends on QCOM_WCNSS_CTRL || QCOM_WCNSS_CTRL=n > + depends on QCOM_SMD || QCOM_SMD=n I thought we wanted to move towards being able to compile the WiFi and Bluetooth support without requiring QCOM_SMD. Regards Marcel
On Wed 09 Nov 12:32 PST 2016, Marcel Holtmann wrote: > Hi Bjorn, > > > In the case SMD or WCNSS_CTRL are compiled as modules, wcn36xx must be > > compiled as module as well, so we need to mention this dependency. > > But we still want allow the driver to be compiled in case either of > > those are =n, for compile testing reasons. > > > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> > > --- > > drivers/net/wireless/ath/wcn36xx/Kconfig | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/drivers/net/wireless/ath/wcn36xx/Kconfig b/drivers/net/wireless/ath/wcn36xx/Kconfig > > index 591ebaea8265..4b83e87f0b94 100644 > > --- a/drivers/net/wireless/ath/wcn36xx/Kconfig > > +++ b/drivers/net/wireless/ath/wcn36xx/Kconfig > > @@ -1,6 +1,8 @@ > > config WCN36XX > > tristate "Qualcomm Atheros WCN3660/3680 support" > > depends on MAC80211 && HAS_DMA > > + depends on QCOM_WCNSS_CTRL || QCOM_WCNSS_CTRL=n > > + depends on QCOM_SMD || QCOM_SMD=n > > I thought we wanted to move towards being able to compile the WiFi and > Bluetooth support without requiring QCOM_SMD. > That's right. The problem I spotted was that without the dependency on QCOM_SMD we're allowed to compile these modules as builtin, but as IS_ENABLED(CONFIG_QCOM_SMD) is true we don't get the stubs and as such the kernel doesn't link. So we must enforce these modules to be compiled as modules if either QCOM_SMD or QCOM_WCNSS_CTRL are compiled as modules, and we do that with the first part of the depends lines. The second part of the depends lines states that the alternative dependency is that the modules are not enabled at all, in which case we will fall back to using the function stubs. So this is unfortunately how we have to describe it in Kconfig to work with the function stubs, sorry for not getting this right in the first place. Regards, Bjorn
diff --git a/drivers/net/wireless/ath/wcn36xx/Kconfig b/drivers/net/wireless/ath/wcn36xx/Kconfig index 591ebaea8265..4b83e87f0b94 100644 --- a/drivers/net/wireless/ath/wcn36xx/Kconfig +++ b/drivers/net/wireless/ath/wcn36xx/Kconfig @@ -1,6 +1,8 @@ config WCN36XX tristate "Qualcomm Atheros WCN3660/3680 support" depends on MAC80211 && HAS_DMA + depends on QCOM_WCNSS_CTRL || QCOM_WCNSS_CTRL=n + depends on QCOM_SMD || QCOM_SMD=n ---help--- This module adds support for wireless adapters based on Qualcomm Atheros WCN3660 and WCN3680 mobile chipsets.
In the case SMD or WCNSS_CTRL are compiled as modules, wcn36xx must be compiled as module as well, so we need to mention this dependency. But we still want allow the driver to be compiled in case either of those are =n, for compile testing reasons. Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> --- drivers/net/wireless/ath/wcn36xx/Kconfig | 2 ++ 1 file changed, 2 insertions(+)