brcm80211: fmac: add Kconfig option for SDIO bus support

This patch adds a Kconfig option for SDIO bus support and abstracts
a build subset correspondingly. It's the final patch of fullmac bus
interface refactoring.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Alwin Beukers <alwin@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/brcm80211/Kconfig b/drivers/net/wireless/brcm80211/Kconfig
index 8f54c2eb68249ae5041773eb746c5d5d3805dd1c..cd6375de2a606a2662ba2c5a63e5906c88b4656c 100644 (file)
--- a/drivers/net/wireless/brcm80211/Kconfig
+++ b/drivers/net/wireless/brcm80211/Kconfig
@@ -17,16 +17,26 @@ config BRCMSMAC
 
 config BRCMFMAC
        tristate "Broadcom IEEE802.11n embedded FullMAC WLAN driver"
-       depends on MMC
        depends on CFG80211
        select BRCMUTIL
-       select FW_LOADER
        ---help---
          This module adds support for embedded wireless adapters based on
-         Broadcom IEEE802.11n FullMAC chipsets.  This driver uses the kernel's
-         wireless extensions subsystem.  If you choose to build a module,
+         Broadcom IEEE802.11n FullMAC chipsets. It has to work with at least
+         one of the bus interface support. If you choose to build a module,
          it'll be called brcmfmac.ko.
 
+config BRCMFMAC_SDIO
+       bool "SDIO bus interface support for FullMAC"
+       depends on MMC
+       depends on BRCMFMAC
+       select FW_LOADER
+       default y
+       ---help---
+         This option enables the SDIO bus interface support for Broadcom
+         FullMAC WLAN driver.
+         Say Y if you want to use brcmfmac for a compatible SDIO interface
+         wireless card.
+
 config BRCMDBG
        bool "Broadcom driver debug functions"
        depends on BRCMSMAC || BRCMFMAC

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/Makefile b/drivers/net/wireless/brcm80211/brcmfmac/Makefile
index d58aa1b0a932de0ed1b095d29c5ece1589492995..9ca9ea1135ea3c311938bf9d86d6b98a557deeba 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/Makefile
+++ b/drivers/net/wireless/brcm80211/brcmfmac/Makefile
@@ -19,16 +19,16 @@ ccflags-y += \
        -Idrivers/net/wireless/brcm80211/brcmfmac       \
        -Idrivers/net/wireless/brcm80211/include
 
-DHDOFILES = \
-       wl_cfg80211.o \
-       dhd_cdc.o \
-       dhd_common.o \
-       dhd_sdio.o      \
-       dhd_linux.o \
-       bcmsdh.o \
-       bcmsdh_sdmmc.o \
-       sdio_chip.o
-
 obj-$(CONFIG_BRCMFMAC) += brcmfmac.o
-brcmfmac-objs += $(DHDOFILES)
+brcmfmac-objs += \
+               wl_cfg80211.o \
+               dhd_cdc.o \
+               dhd_common.o \
+               dhd_linux.o
+brcmfmac-$(CONFIG_BRCMFMAC_SDIO) += \
+               dhd_sdio.o \
+               bcmsdh.o \
+               bcmsdh_sdmmc.o \
+               sdio_chip.o
+
 ccflags-y += -D__CHECK_ENDIAN__