Changeset 41037


Ignore:
Timestamp:
2014-06-06T18:24:21+02:00 (4 years ago)
Author:
nbd
Message:

b43: fix ssb/bcma dependencies

Signed-off-by: Felix Fietkau <nbd@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/kernel/mac80211/Makefile

    r41015 r41037  
    10721072        CONFIG_HW_RANDOM=y 
    10731073  # Depend on PCI_SUPPORT to make sure we can select kmod-bcma or kmod-ssb 
    1074   DEPENDS+= +kmod-mac80211 +!(TARGET_brcm47xx||TARGET_brcm63xx):PCI_SUPPORT 
     1074  DEPENDS += \ 
     1075        @PCI_SUPPORT +kmod-mac80211 \ 
     1076        $(if $(CONFIG_PACKAGE_B43_USE_SSB),+kmod-ssb) \ 
     1077        $(if $(CONFIG_PACKAGE_B43_USE_BCMA),+kmod-bcma) 
    10751078  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/b43/b43.ko 
    10761079  AUTOLOAD:=$(call AutoProbe,b43) 
     
    10791082 
    10801083define KernelPackage/b43/config 
     1084 
     1085config PACKAGE_B43_USE_SSB 
     1086        select PACKAGE_kmod-ssb 
     1087        tristate 
     1088        depends on !TARGET_brcm47xx 
     1089        default PACKAGE_kmod-b43 if PACKAGE_B43_BUSES_BCMA_AND_SSB 
     1090        default PACKAGE_kmod-b43 if PACKAGE_B43_BUSES_SSB 
     1091 
     1092config PACKAGE_B43_USE_BCMA 
     1093        select PACKAGE_kmod-bcma 
     1094        tristate 
     1095        depends on !TARGET_brcm47xx 
     1096        default PACKAGE_kmod-b43 if PACKAGE_B43_BUSES_BCMA_AND_SSB 
     1097        default PACKAGE_kmod-b43 if PACKAGE_B43_BUSES_BCMA 
     1098 
    10811099  if PACKAGE_kmod-b43 
    10821100 
     
    11881206        config PACKAGE_B43_BUSES_BCMA_AND_SSB 
    11891207                bool "BCMA and SSB" 
    1190                 select PACKAGE_kmod-bcma if !TARGET_brcm47xx 
    1191                 select PACKAGE_kmod-ssb if !(TARGET_brcm47xx || TARGET_brcm63xx) 
    11921208 
    11931209        config PACKAGE_B43_BUSES_BCMA 
    11941210                bool "BCMA only" 
    1195                 select PACKAGE_kmod-bcma if !TARGET_brcm47xx 
    11961211 
    11971212        config PACKAGE_B43_BUSES_SSB 
    11981213                bool "SSB only" 
    1199                 select PACKAGE_kmod-ssb if !(TARGET_brcm47xx || TARGET_brcm63xx) 
    12001214 
    12011215        endchoice 
Note: See TracChangeset for help on using the changeset viewer.