aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/Makefile
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-06-06 16:24:21 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-06-06 16:24:21 +0000
commitb023acbfab69d2111b00868d297c14cdea8f8f7a (patch)
tree6588d28afa9be6a9900fc3c6003e2fd36ea7b71e /package/kernel/mac80211/Makefile
parent2ef5c5d472bdd6e2c9dda8f2527b1f70369915ea (diff)
downloadupstream-b023acbfab69d2111b00868d297c14cdea8f8f7a.tar.gz
upstream-b023acbfab69d2111b00868d297c14cdea8f8f7a.tar.bz2
upstream-b023acbfab69d2111b00868d297c14cdea8f8f7a.zip
b43: fix ssb/bcma dependencies
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41037 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/Makefile')
-rw-r--r--package/kernel/mac80211/Makefile24
1 files changed, 19 insertions, 5 deletions
diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index 5654adafc0..19f8c3bd13 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -1071,13 +1071,31 @@ define KernelPackage/b43
KCONFIG:= \
CONFIG_HW_RANDOM=y
# 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
AUTOLOAD:=$(call AutoProbe,b43)
MENU:=1
endef
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
choice
@@ -1187,16 +1205,12 @@ define KernelPackage/b43/config
config PACKAGE_B43_BUSES_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
bool "BCMA only"
- select PACKAGE_kmod-bcma if !TARGET_brcm47xx
config PACKAGE_B43_BUSES_SSB
bool "SSB only"
- select PACKAGE_kmod-ssb if !(TARGET_brcm47xx || TARGET_brcm63xx)
endchoice