remove a few config settings from mac80211
MAC80211_DEBUGFS selects the atheros wireless debugfs options,
but not the debugfs options from rt2x00-lib and b43.
Make it consistent and remove all driver_DEBUGFS option.
ATH_DEBUG needs MAC80211_DEBUGFS, so select it.
Signed-off-by: Stefan Hellermann <[email protected]>
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -218,14 +218,6 @@ endef
define KernelPackage/rt2x00-lib/config
if PACKAGE_kmod-rt2x00-lib
- config PACKAGE_RT2X00_LIB_DEBUGFS
- bool "Enable rt2x00 debugfs support"
- depends PACKAGE_MAC80211_DEBUGFS
- help
- Enable creation of debugfs files for the rt2x00 drivers.
- These debugfs files support both reading and writing of the
- most important register types of the rt2x00 hardware.
-
config PACKAGE_RT2X00_DEBUG
bool "Enable rt2x00 debug output"
help
@@ -385,9 +377,9 @@ define KernelPackage/ath/config
config PACKAGE_ATH_DEBUG
bool "Atheros wireless debugging"
+ select PACKAGE_MAC80211_DEBUGFS
help
Say Y, if you want to debug atheros wireless drivers.
- Right now only ath9k makes use of this.
endif
endef
@@ -1171,9 +1163,9 @@ BUILDFLAGS:= \
-DCONFIG_B43_HWRNG -DCONFIG_B43LEGACY_HWRNG \
$(if $(CONFIG_PCI),-DCONFIG_ATH9K_PCI) \
$(if $(CONFIG_TARGET_ar71xx),-DCONFIG_ATH9K_AHB) \
- $(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS), -DCONFIG_CFG80211_DEBUGFS
-DCONFIG_MAC80211_DEBUGFS -DCONFIG_ATH9K_DEBUGFS -DCONFIG_CARL9170_DEBUGFS
-DCONFIG_ATH9K_HTC_DEBUGFS -DCONFIG_ATH5K_DEBUG) \
+ $(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS), -DCONFIG_CFG80211_DEBUGFS
-DCONFIG_MAC80211_DEBUGFS -DCONFIG_ATH9K_DEBUGFS -DCONFIG_CARL9170_DEBUGFS
-DCONFIG_ATH9K_HTC_DEBUGFS -DCONFIG_RT2X00_LIB_DEBUGFS) \
$(if $(CONFIG_PACKAGE_MAC80211_MESH),-DCONFIG_MAC80211_MESH) \
- $(if $(CONFIG_PACKAGE_ATH_DEBUG),-DCONFIG_ATH_DEBUG
-DCONFIG_ATH9K_PKTLOG) \
+ $(if $(CONFIG_PACKAGE_ATH_DEBUG),-DCONFIG_ATH_DEBUG
-DCONFIG_ATH9K_PKTLOG -DCONFIG_ATH9K_MAC_DEBUG -DCONFIG_ATH5K_DEBUG) \
-D__CONFIG_MAC80211_RC_DEFAULT=minstrel \
-DCONFIG_MAC80211_RC_MINSTREL_HT \
$(if $(CONFIG_ATH_USER_REGD),-DATH_USER_REGD=1) \
@@ -1185,7 +1177,6 @@ BUILDFLAGS:= \
$(if $(CONFIG_PACKAGE_B43_PHY_LCN),-DCONFIG_B43_PHY_LCN) \
-DCONFIG_B43_BCMA -DCONFIG_B43_BCMA_EXTRA \
-DCONFIG_B43_SSB \
- $(if $(CONFIG_PACKAGE_RT2X00_LIB_DEBUGFS),-DCONFIG_RT2X00_LIB_DEBUGFS) \
$(if $(CONFIG_PACKAGE_RT2X00_DEBUG),-DCONFIG_RT2X00_DEBUG) \
$(if $(NEED_RT2X00_LIB_HT),-DCONFIG_RT2X00_LIB_HT) \
$(if $(NEED_RT2X00_LIB_CRYPTO),-DCONFIG_RT2X00_LIB_CRYPTO) \
@@ -1239,7 +1230,7 @@ MAKE_OPTS:= \
CONFIG_ATH5K=$(if $(CONFIG_PACKAGE_kmod-ath5k),m) \
CONFIG_ATH5K_PCI=$(if $(CONFIG_TARGET_atheros),,y) \
CONFIG_ATH5K_AHB=$(if $(CONFIG_TARGET_atheros),y) \
- CONFIG_ATH5K_DEBUG=$(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),y) \
+ CONFIG_ATH5K_DEBUG=$(if $(CONFIG_PACKAGE_ATH_DEBUG),y) \
CONFIG_ATH9K=$(if $(CONFIG_PACKAGE_kmod-ath9k),m) \
CONFIG_ATH9K_PCI=$(CONFIG_PCI) \
CONFIG_ATH9K_AHB=$(if $(CONFIG_TARGET_ar71xx),y) \
@@ -1248,6 +1239,7 @@ MAKE_OPTS:= \
CONFIG_ATH9K_HW=$(if $(CONFIG_PACKAGE_kmod-ath9k-common),m) \
CONFIG_ATH9K_COMMON=$(if $(CONFIG_PACKAGE_kmod-ath9k-common),m) \
CONFIG_ATH9K_DEBUGFS=$(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),y) \
+ CONFIG_ATH9K_MAC_DEBUG=$(if $(CONFIG_PACKAGE_ATH_DEBUG),y) \
CONFIG_CARL9170=$(if $(CONFIG_PACKAGE_kmod-carl9170),m) \
CONFIG_CARL9170_DEBUGFS=$(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),y) \
CONFIG_COMPAT_ZD1211RW=$(if $(CONFIG_PACKAGE_kmod-zd1211rw),m) \
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
