net: wireless: bcmdhd: make delayed firmware loading a Kconfig option
Mursalin Akon [Fri, 27 Jan 2012 22:35:03 +0000 (14:35 -0800)]
Make delayed firmware loading a Kconfig option.
Config option BCMDHD_INSMOD_NO_FW_LOAD controls
this feature.

Bug 924521

(cherry picked from commit 9a0219b500f677381b3d912c73a9755cb0eb1caa)

Signed-off-by: Mursalin Akon <makon@nvidia.com>
Change-Id: I5d48f6c7484bbf8d5d6825f4b3a08d711ff86558
Reviewed-on: http://git-master/r/82877
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Allen Martin <amartin@nvidia.com>

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

index 7846b8d..ee71739 100644 (file)
@@ -53,3 +53,10 @@ config BCMDHD_CSCAN_ENABLE
        default n
        ---help---
        Enable Combo Scan
+
+config BCMDHD_INSMOD_NO_FW_LOAD
+       bool "Enable delayed firmware load"
+       depends on BCMDHD
+       default n
+       ---help---
+       Enable delayes firmware
index 7e16e94..4f49c5e 100644 (file)
@@ -7,7 +7,7 @@ DHDCFLAGS = -Wall -Wstrict-prototypes -Dlinux -DBCMDRIVER                     \
        -DMMC_SDIO_ABORT -DBCMSDIO -DBCMLXSDMMC -DBCMPLATFORM_BUS -DWLP2P     \
        -DNEW_COMPAT_WIRELESS -DWIFI_ACT_FRAME -DARP_OFFLOAD_SUPPORT          \
        -DKEEP_ALIVE -DPKT_FILTER_SUPPORT     \
-       -DEMBEDDED_PLATFORM -DENABLE_INSMOD_NO_FW_LOAD          \
+       -DEMBEDDED_PLATFORM           \
        -Idrivers/net/wireless/bcmdhd -Idrivers/net/wireless/bcmdhd/include
 
 ifeq ($(CONFIG_BCMDHD_WIFI_CONTROL_FUNC),y)
@@ -26,6 +26,10 @@ ifeq ($(CONFIG_BCMDHD_CSCAN_ENABLE),y)
 DHDCFLAGS += -DCSCAN -DPNO_SUPPORT
 endif
 
+ifeq ($(CONFIG_BCMDHD_INSMOD_NO_FW_LOAD),y)
+DHDCFLAGS += -DENABLE_INSMOD_NO_FW_LOAD
+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            \