diff mbox

brcmfmac: fix bus interface selection in Kconfig

Message ID 1378212369-17166-1-git-send-email-arend@broadcom.com (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Arend van Spriel Sept. 3, 2013, 12:46 p.m. UTC 
The kernel configuration for the driver could result in
compilation issues as reported by Randy Dunlap. His results
are show below:

"on x86_64:

when
CONFIG_MMC=m
CONFIG_BRCMUTIL=y
CONFIG_BRCMFMAC=y
CONFIG_BRCMFMAC_SDIO=y

This bool kconfig symbol:

config BRCMFMAC_SDIO
	bool "SDIO bus interface support for FullMAC driver"
	depends on MMC

allows BRCMFMAC_SDIO to be y even when MMC=m.

Is there a reasonable solution to this?

This causes many build errors:

drivers/built-in.o: In function `brcmf_sdio_assert_info':
dhd_sdio.c:(.text+0x39609b): undefined reference to `sdio_claim_host'
dhd_sdio.c:(.text+0x3960d9): undefined reference to `sdio_release_host'
drivers/built-in.o: In function `brcmf_sdio_readframes':
dhd_sdio.c:(.text+0x396a62): undefined reference to `sdio_claim_host'
dhd_sdio.c:(.text+0x396a9b): undefined reference to `sdio_release_host'
..."

This patch adds the appropriate logic in Kconfig to resolve
these issues. The solution was provided by Hauke Mehrtens.

Reported-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
Hi John,

Probably the merge window has already been started after the surpirse release
of 3.11, but this one was reported by Randy Dunlap on linux-next tree and
earlier today by Fenguang Wu. Maybe good to take it in the wireless-next tree.

Regards,
Arend
---
 drivers/net/wireless/brcm80211/Kconfig |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Randy Dunlap Sept. 3, 2013, 7:43 p.m. UTC | #1 
On 09/03/13 05:46, Arend van Spriel wrote:
> The kernel configuration for the driver could result in
> compilation issues as reported by Randy Dunlap. His results
> are show below:
> 
> "on x86_64:
> 
> when
> CONFIG_MMC=m
> CONFIG_BRCMUTIL=y
> CONFIG_BRCMFMAC=y
> CONFIG_BRCMFMAC_SDIO=y
> 
> This bool kconfig symbol:
> 
> config BRCMFMAC_SDIO
> 	bool "SDIO bus interface support for FullMAC driver"
> 	depends on MMC
> 
> allows BRCMFMAC_SDIO to be y even when MMC=m.
> 
> Is there a reasonable solution to this?
> 
> This causes many build errors:
> 
> drivers/built-in.o: In function `brcmf_sdio_assert_info':
> dhd_sdio.c:(.text+0x39609b): undefined reference to `sdio_claim_host'
> dhd_sdio.c:(.text+0x3960d9): undefined reference to `sdio_release_host'
> drivers/built-in.o: In function `brcmf_sdio_readframes':
> dhd_sdio.c:(.text+0x396a62): undefined reference to `sdio_claim_host'
> dhd_sdio.c:(.text+0x396a9b): undefined reference to `sdio_release_host'
> ..."
> 
> This patch adds the appropriate logic in Kconfig to resolve
> these issues. The solution was provided by Hauke Mehrtens.
> 
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Cc: Hauke Mehrtens <hauke@hauke-m.de>
> Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
> Signed-off-by: Arend van Spriel <arend@broadcom.com>

Acked-by: Randy Dunlap <rdunlap@infradead.org>

Thanks.


> ---
> Hi John,
> 
> Probably the merge window has already been started after the surpirse release
> of 3.11, but this one was reported by Randy Dunlap on linux-next tree and
> earlier today by Fenguang Wu. Maybe good to take it in the wireless-next tree.
> 
> Regards,
> Arend
> ---
>  drivers/net/wireless/brcm80211/Kconfig |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/wireless/brcm80211/Kconfig b/drivers/net/wireless/brcm80211/Kconfig
> index fc8a0fa..b00a7e9 100644
> --- a/drivers/net/wireless/brcm80211/Kconfig
> +++ b/drivers/net/wireless/brcm80211/Kconfig
> @@ -28,7 +28,7 @@ config BRCMFMAC
>  
>  config BRCMFMAC_SDIO
>  	bool "SDIO bus interface support for FullMAC driver"
> -	depends on MMC
> +	depends on (MMC = y || MMC = BRCMFMAC)
>  	depends on BRCMFMAC
>  	select FW_LOADER
>  	default y
> @@ -39,7 +39,7 @@ config BRCMFMAC_SDIO
>  
>  config BRCMFMAC_USB
>  	bool "USB bus interface support for FullMAC driver"
> -	depends on USB
> +	depends on (USB = y || USB = BRCMFMAC)
>  	depends on BRCMFMAC
>  	select FW_LOADER
>  	---help---
>
diff mbox

Patch

diff --git a/drivers/net/wireless/brcm80211/Kconfig b/drivers/net/wireless/brcm80211/Kconfig
index fc8a0fa..b00a7e9 100644
--- a/drivers/net/wireless/brcm80211/Kconfig
+++ b/drivers/net/wireless/brcm80211/Kconfig
@@ -28,7 +28,7 @@  config BRCMFMAC
 
 config BRCMFMAC_SDIO
 	bool "SDIO bus interface support for FullMAC driver"
-	depends on MMC
+	depends on (MMC = y || MMC = BRCMFMAC)
 	depends on BRCMFMAC
 	select FW_LOADER
 	default y
@@ -39,7 +39,7 @@  config BRCMFMAC_SDIO
 
 config BRCMFMAC_USB
 	bool "USB bus interface support for FullMAC driver"
-	depends on USB
+	depends on (USB = y || USB = BRCMFMAC)
 	depends on BRCMFMAC
 	select FW_LOADER
 	---help---