domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

b43: fix ssb/bcma dependencies

Browse Source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41037
This commit is contained in:
Felix Fietkau
2014-06-06 16:24:21 +00:00
parent a57aec309d
commit 11a0bcdfca
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
package/kernel/mac80211/Makefile
View File

@@ -1071,13 +1071,31 @@ define KernelPackage/b43
KCONFIG:= \ KCONFIG:= \
CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM=y
# Depend on PCI_SUPPORT to make sure we can select kmod-bcma or kmod-ssb # Depend on PCI_SUPPORT to make sure we can select kmod-bcma or kmod-ssb
DEPENDS+= +kmod-mac80211 +!(TARGET_brcm47xx||TARGET_brcm63xx):PCI_SUPPORT DEPENDS += \
@PCI_SUPPORT +kmod-mac80211 \
$(if $(CONFIG_PACKAGE_B43_USE_SSB),+kmod-ssb) \
$(if $(CONFIG_PACKAGE_B43_USE_BCMA),+kmod-bcma)
FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/b43/b43.ko FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/b43/b43.ko
AUTOLOAD:=$(call AutoProbe,b43) AUTOLOAD:=$(call AutoProbe,b43)
MENU:=1 MENU:=1
endef endef
define KernelPackage/b43/config define KernelPackage/b43/config
config PACKAGE_B43_USE_SSB
select PACKAGE_kmod-ssb
tristate
depends on !TARGET_brcm47xx
default PACKAGE_kmod-b43 if PACKAGE_B43_BUSES_BCMA_AND_SSB
default PACKAGE_kmod-b43 if PACKAGE_B43_BUSES_SSB
config PACKAGE_B43_USE_BCMA
select PACKAGE_kmod-bcma
tristate
depends on !TARGET_brcm47xx
default PACKAGE_kmod-b43 if PACKAGE_B43_BUSES_BCMA_AND_SSB
default PACKAGE_kmod-b43 if PACKAGE_B43_BUSES_BCMA
if PACKAGE_kmod-b43 if PACKAGE_kmod-b43
choice choice
@@ -1187,16 +1205,12 @@ define KernelPackage/b43/config
config PACKAGE_B43_BUSES_BCMA_AND_SSB config PACKAGE_B43_BUSES_BCMA_AND_SSB
bool "BCMA and SSB" bool "BCMA and SSB"
select PACKAGE_kmod-bcma if !TARGET_brcm47xx
select PACKAGE_kmod-ssb if !(TARGET_brcm47xx || TARGET_brcm63xx)
config PACKAGE_B43_BUSES_BCMA config PACKAGE_B43_BUSES_BCMA
bool "BCMA only" bool "BCMA only"
select PACKAGE_kmod-bcma if !TARGET_brcm47xx
config PACKAGE_B43_BUSES_SSB config PACKAGE_B43_BUSES_SSB
bool "SSB only" bool "SSB only"
select PACKAGE_kmod-ssb if !(TARGET_brcm47xx || TARGET_brcm63xx)
endchoice endchoice