net: wireless: bcmdhd: cleanup Kconfig/Make
Mursalin Akon [Thu, 16 Aug 2012 17:01:28 +0000 (10:01 -0700)]
cleanup bcmdhd driver Kconfig and Makefile

Bug 1029792
Bug 1029733

Change-Id: Ic947644d2159a52fab7aea1621e12e51d8ee6332
Signed-off-by: Mursalin Akon <makon@nvidia.com>
Reviewed-on: http://git-master/r/141627
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Matthew Pedro <mapedro@nvidia.com>
GVS: Gerrit_Virtual_Submit

drivers/net/wireless/bcmdhd/Kconfig
drivers/net/wireless/bcmdhd/Makefile

index ef9ce5a..b02a173 100644 (file)
@@ -26,6 +26,7 @@ config BCMDHD_NVRAM_DIR
 
 config BCMDHD_WEXT
        bool "Enable WEXT support"
+       depends on BCMDHD
        select WIRELESS_EXT
        select WEXT_PRIV
        help
@@ -54,15 +55,11 @@ config DHD_ENABLE_P2P
 
 config BCMDHD_CFG80211
        bool "Enable CFG80211 support"
-       depends on CFG80211
+       depends on BCMDHD && CFG80211
+       default n
        help
          Enables CFG80211 support
 
-config BCMDHD_NOAPI
-       bool "No wireless API"
-       help
-         No wireless API is needed
-
 config BCMDHD_WIFI_CONTROL_FUNC
        bool "Use bcmdhd_wlan device"
        depends on BCMDHD
index 50fac43..4ec987d 100644 (file)
@@ -44,7 +44,7 @@ endif
 DHDOFILES = aiutils.o bcmsdh_sdmmc_linux.o dhd_linux.o siutils.o bcmutils.o   \
        dhd_linux_sched.o bcmwifi.o dhd_sdio.o bcmevent.o dhd_bta.o hndpmu.o  \
        bcmsdh.o dhd_cdc.o bcmsdh_linux.o dhd_common.o linux_osl.o            \
-       bcmsdh_sdmmc.o dhd_custom_gpio.o sbutils.o wldev_common.o wl_android.o dhd_cfg80211.o
+       bcmsdh_sdmmc.o dhd_custom_gpio.o sbutils.o wldev_common.o wl_android.o
 
 obj-$(CONFIG_BCMDHD) += bcmdhd.o
 bcmdhd-objs += $(DHDOFILES)
@@ -54,17 +54,21 @@ bcmdhd-objs += wl_iw.o
 DHDCFLAGS += -DSOFTAP -DWL_WIRELESS_EXT
 endif
 
-ifneq ($(CONFIG_CFG80211),)
-bcmdhd-objs += wl_cfg80211.o wl_cfgp2p.o wl_linux_mon.o
+ifneq ($(CONFIG_BCMDHD_CFG80211),)
+bcmdhd-objs += wl_cfg80211.o dhd_cfg80211.o wl_cfgp2p.o wl_linux_mon.o
 DHDCFLAGS += -DWL_CFG80211
 endif
+
 ifneq ($(CONFIG_DHD_USE_SCHED_SCAN),)
 DHDCFLAGS += -DWL_SCHED_SCAN
 endif
+
 ifneq ($(CONFIG_DHD_ENABLE_P2P),)
 DHDCFLAGS += -DWL_ENABLE_P2P_IF
 endif
+
 EXTRA_CFLAGS = $(DHDCFLAGS)
+
 ifeq ($(CONFIG_BCMDHD),m)
 EXTRA_LDFLAGS += --strip-debug
 endif