diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-06-05 13:51:15 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-06-05 13:51:15 +0000 |
| commit | 48b954881f8483740f61c8054f906e4575fab6fd (patch) | |
| tree | 95623dd2d92c464d86669f39576e10117e476be4 /package/kernel | |
| parent | 93b86d3bd1f208eaabc4ecd9e863792f2f0c0ec3 (diff) | |
| download | upstream-48b954881f8483740f61c8054f906e4575fab6fd.tar.gz upstream-48b954881f8483740f61c8054f906e4575fab6fd.tar.bz2 upstream-48b954881f8483740f61c8054f906e4575fab6fd.zip | |
mac80211: b43: make support for SSB optional
Now we have a choice submenu, just like b43 in the mainline.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41015 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel')
| -rw-r--r-- | package/kernel/mac80211/Makefile | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile index fb11f2cafb..5654adafc0 100644 --- a/package/kernel/mac80211/Makefile +++ b/package/kernel/mac80211/Makefile @@ -1070,7 +1070,8 @@ define KernelPackage/b43 URL:=http://linuxwireless.org/en/users/Drivers/b43 KCONFIG:= \ CONFIG_HW_RANDOM=y - DEPENDS+= +kmod-mac80211 +!(TARGET_brcm47xx||TARGET_brcm63xx):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 FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/b43/b43.ko AUTOLOAD:=$(call AutoProbe,b43) MENU:=1 @@ -1178,10 +1179,26 @@ define KernelPackage/b43/config Example (keep files for G-PHY and N-PHY): G,N + choice + prompt "Supported buses" + default PACKAGE_B43_BUSES_BCMA_AND_SSB + help + This allows choosing buses that b43 should support. + + 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 "Support for BCMA bus" + bool "BCMA only" select PACKAGE_kmod-bcma if !TARGET_brcm47xx - default y + + config PACKAGE_B43_BUSES_SSB + bool "SSB only" + select PACKAGE_kmod-ssb if !(TARGET_brcm47xx || TARGET_brcm63xx) + + endchoice config PACKAGE_B43_DEBUG bool "Enable debug output and debugfs for b43" @@ -1433,11 +1450,9 @@ endif config-$(call config_package,carl9170) += CARL9170 config-$(call config_package,b43) += B43 -ifeq ($(CONFIG_PACKAGE_B43_BUSES_BCMA),y) -config-y += B43_BUSES_BCMA_AND_SSB -else -config-y += B43_BUSES_SSB -endif +config-$(CONFIG_PACKAGE_B43_BUSES_BCMA_AND_SSB) += B43_BUSES_BCMA_AND_SSB +config-$(CONFIG_PACKAGE_B43_BUSES_BCMA) += B43_BUSES_BCMA +config-$(CONFIG_PACKAGE_B43_BUSES_SSB) += B43_BUSES_SSB config-$(CONFIG_PACKAGE_B43_PHY_N) += B43_PHY_N config-$(CONFIG_PACKAGE_B43_PHY_LP) += B43_PHY_LP config-$(CONFIG_PACKAGE_B43_PHY_HT) += B43_PHY_HT |