Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ea0f6fa authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: allow both driver are created in single build 



This patch allows to build both drivers. Previous patch for this
failed using -j option. This has been fixed by adding files with
include statement for the fullmac driver. Verified this is working
using -j4 option.

Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8a6257fb

drivers/staging/brcm80211/Kconfig

+7 −7
Original line number Diff line number Diff line
@@ -2,12 +2,6 @@ menuconfig BRCM80211 
	tristate "Broadcom IEEE802.11n WLAN drivers"

	depends on WLAN



choice

	prompt "Broadcom IEEE802.11n driver style"

	depends on BRCM80211

	help

	Select the appropriate driver style from the list below.



config BRCMSMAC

	bool "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver"

	depends on PCI
@@ -30,4 +24,10 @@ config BRCMFMAC 
	  Broadcom IEEE802.11n FullMAC chipsets.  This driver uses the kernel's

	  wireless extensions subsystem.  If you choose to build a module,

	  it'll be called brcmfmac.ko.

endchoice
 


config BRCMDBG

	bool "Broadcom driver debug functions"

	default n

	depends on BRCM80211

	---help---

	  Selecting this enables additional code for debug purposes.

drivers/staging/brcm80211/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -15,8 +15,9 @@ 
# OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.



# one and only common flag

subdir-ccflags-y := -DBCMDBG

# common flags

subdir-ccflags-y					:= -DBCMDMA32

subdir-ccflags-$(CONFIG_BRCMDBG)	+= -DBCMDBG -DBCMDBG_ASSERT



obj-$(CONFIG_BRCMFMAC)	+= brcmfmac/

obj-$(CONFIG_BRCMSMAC)	+= brcmsmac/

drivers/staging/brcm80211/brcmfmac/Makefile

+13 −10
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ ccflags-y := \ 
	-DBCMSDIO		\

	-DBDC			\

	-DBRCM_FULLMAC		\

	-DDHD_DEBUG		\

	-DDHD_FIRSTREAD=64	\

	-DDHD_SCHED		\

	-DDHD_SDALIGN=64	\
@@ -31,7 +30,11 @@ ccflags-y := \ 
	-DMMC_SDIO_ABORT	\

	-DPKT_FILTER_SUPPORT	\

	-DSHOW_EVENTS		\

	-DTOE			\

	-DTOE



ccflags-$(CONFIG_BRCMDBG)	+= -DDHD_DEBUG



ccflags-y += \

	-Idrivers/staging/brcm80211/brcmfmac	\

	-Idrivers/staging/brcm80211/include		\

	-Idrivers/staging/brcm80211/util
@@ -49,13 +52,13 @@ DHDOFILES = \ 
	bcmsdh_linux.o	\

	bcmsdh_sdmmc.o \

	bcmsdh_sdmmc_linux.o \

	../util/linux_osl.o \

	../util/aiutils.o \

	../util/siutils.o \

	../util/sbutils.o \

	../util/bcmutils.o \

	../util/bcmwifi.o \

	../util/hndpmu.o

	linux_osl.o \

	aiutils.o \

	siutils.o \

	sbutils.o \

	bcmutils.o \

	bcmwifi.o \

	hndpmu.o



obj-m += brcmfmac.o

brcmfmac-objs += $(DHDOFILES)

drivers/staging/brcm80211/brcmfmac/aiutils.c

0 → 100644
+1 −0
Original line number Diff line number Diff line 
#include "../util/aiutils.c"

drivers/staging/brcm80211/brcmfmac/bcmutils.c

0 → 100644
+1 −0
Original line number Diff line number Diff line 
#include "../util/bcmutils.c"