[source] mac80211: fix kconfig recursive dependency warning

LEDE Commits lede-commits at lists.infradead.org
Tue Apr 18 00:45:30 PDT 2017


nbd pushed a commit to source.git, branch master:
https://git.lede-project.org/00b32b8326a4de676f55e4a59ac6e7c2c401f9b5

commit 00b32b8326a4de676f55e4a59ac6e7c2c401f9b5
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Tue Apr 18 09:42:04 2017 +0200

    mac80211: fix kconfig recursive dependency warning
    
    Make brcmfmac depend on !TARGET_uml.
    Technically, brcmfmac could be built for uml because only SDIO support
    won't work on that target. However, selectively avoiding the dependency
    propagation of !TARGET_uml from kmod-mmc to avoid including a reference
    to BRCMFMAC_SDIO doesn't work.
    
    In practice, brcmfmac is completely useless on uml, so let's just
    disable it there.
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 package/kernel/mac80211/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index c5a2577..39cda12 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -689,7 +689,7 @@ define KernelPackage/brcmfmac
   TITLE:=Broadcom IEEE802.11n USB FullMAC WLAN driver
   URL:=https://wireless.wiki.kernel.org/en/users/drivers/brcm80211
   DEPENDS+= @USB_SUPPORT +kmod-cfg80211 + at DRIVER_11N_SUPPORT + at DRIVER_11AC_SUPPORT +kmod-brcmutil \
-	+BRCMFMAC_SDIO&&!TARGET_uml:kmod-mmc \
+	+BRCMFMAC_SDIO:kmod-mmc @!TARGET_uml \
 	+BRCMFMAC_USB:kmod-usb-core +BRCMFMAC_USB:brcmfmac-firmware-usb
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
   AUTOLOAD:=$(call AutoProbe,brcmfmac)
@@ -704,7 +704,6 @@ define KernelPackage/brcmfmac/config
 
 	config BRCMFMAC_SDIO
 		bool "Enable SDIO bus interface support"
-		depends on !TARGET_uml
 		default y if TARGET_brcm2708
 		default n
 		help



More information about the lede-commits mailing list