Author: nbd Date: 2014-06-05 15:51:15 +0200 (Thu, 05 Jun 2014) New Revision: 41015
Modified: trunk/package/kernel/mac80211/Makefile Log: mac80211: b43: make support for SSB optional Now we have a choice submenu, just like b43 in the mainline. Signed-off-by: Rafa?\197?\130 Mi?\197?\130ecki <[email protected]> Modified: trunk/package/kernel/mac80211/Makefile =================================================================== --- trunk/package/kernel/mac80211/Makefile 2014-06-05 13:51:11 UTC (rev 41014) +++ trunk/package/kernel/mac80211/Makefile 2014-06-05 13:51:15 UTC (rev 41015) @@ -1070,7 +1070,8 @@ 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,11 +1179,27 @@ 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" default n @@ -1433,11 +1450,9 @@ 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 _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
