diff options
| author | Mursalin Akon <makon@nvidia.com> | 2012-01-27 14:35:03 -0800 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-02-27 20:45:42 -0800 |
| commit | 0b2a58c1a31f2962dd0efd2599111b0a0be594c2 (patch) | |
| tree | 18fc4bc84f0da7658ebbf102db5f890a0407aaf1 /drivers/net | |
| parent | cc2c49c0e289bf1d65b00d2542983b3c5bed8f44 (diff) | |
net: wireless: bcmdhd: make delayed firmware loading a Kconfig option
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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/net/wireless/bcmdhd/Makefile | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/drivers/net/wireless/bcmdhd/Kconfig b/drivers/net/wireless/bcmdhd/Kconfig index 7846b8d3092c..ee717395bd3c 100644 --- a/drivers/net/wireless/bcmdhd/Kconfig +++ b/drivers/net/wireless/bcmdhd/Kconfig @@ -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 diff --git a/drivers/net/wireless/bcmdhd/Makefile b/drivers/net/wireless/bcmdhd/Makefile index 7e16e94282f6..4f49c5ec8b05 100644 --- a/drivers/net/wireless/bcmdhd/Makefile +++ b/drivers/net/wireless/bcmdhd/Makefile @@ -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 \ |