From 191e3002b04e7d3beb461c00a3c959ef924520bf Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 2 Jun 2014 18:17:48 +0000 Subject: [PATCH] mac80211: b43: make support for BCMA optional MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40985 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/mac80211/Makefile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile index a328d61cef..fb11f2cafb 100644 --- a/package/kernel/mac80211/Makefile +++ b/package/kernel/mac80211/Makefile @@ -1070,7 +1070,7 @@ define KernelPackage/b43 URL:=http://linuxwireless.org/en/users/Drivers/b43 KCONFIG:= \ CONFIG_HW_RANDOM=y - DEPENDS+= +kmod-mac80211 +!TARGET_brcm47xx:kmod-bcma +!(TARGET_brcm47xx||TARGET_brcm63xx):kmod-ssb + DEPENDS+= +kmod-mac80211 +!(TARGET_brcm47xx||TARGET_brcm63xx):kmod-ssb FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/b43/b43.ko AUTOLOAD:=$(call AutoProbe,b43) MENU:=1 @@ -1178,6 +1178,11 @@ define KernelPackage/b43/config Example (keep files for G-PHY and N-PHY): G,N + config PACKAGE_B43_BUSES_BCMA + bool "Support for BCMA bus" + select PACKAGE_kmod-bcma if !TARGET_brcm47xx + default y + config PACKAGE_B43_DEBUG bool "Enable debug output and debugfs for b43" default n @@ -1428,7 +1433,11 @@ endif config-$(call config_package,carl9170) += CARL9170 config-$(call config_package,b43) += B43 -config-y += B43_SSB B43_BCMA +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_PHY_N) += B43_PHY_N config-$(CONFIG_PACKAGE_B43_PHY_LP) += B43_PHY_LP config-$(CONFIG_PACKAGE_B43_PHY_HT) += B43_PHY_HT -- 2.11.0