Changeset 41594


Ignore:
Timestamp:
2014-07-12T17:39:31+02:00 (4 years ago)
Author:
hauke
Message:

brcm47xx: deactivate ssb and old phy code for new devices

This deactivates ssb and G-PHY code in b43 for the mips74k profile in
brcm47xx.

Signed-off-by: Hauke Mehrtens <hauke@…>

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/kernel/linux/modules/netdevices.mk

    r40662 r41594  
    447447  TITLE:=Broadcom 44xx driver 
    448448  KCONFIG:=CONFIG_B44 
    449   DEPENDS:=@PCI_SUPPORT +!TARGET_brcm47xx:kmod-ssb +kmod-mii +LINUX_3_14:kmod-libphy 
     449  DEPENDS:=@PCI_SUPPORT @!TARGET_brcm47xx_mips74k +!TARGET_brcm47xx:kmod-ssb +kmod-mii +LINUX_3_14:kmod-libphy 
    450450  SUBMENU:=$(NETWORK_DEVICES_MENU) 
    451451  FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/b44.ko 
  • trunk/package/kernel/mac80211/Makefile

    r41524 r41594  
    12011201                depends on B43_FW_SQUASH 
    12021202                default "5,6,7,8,9,10,11,13,15" if TARGET_brcm47xx_legacy 
    1203                 default "5,6,7,8,9,10,11,13,15,16,29" 
     1203                default "16,28,29" if TARGET_brcm47xx_mips74k 
     1204                default "5,6,7,8,9,10,11,13,15,16,28,29" 
    12041205                help 
    12051206                  This is a comma seperated list of core revision numbers. 
     
    12151216                depends on B43_FW_SQUASH 
    12161217                default "G,LP" if TARGET_brcm47xx_legacy 
     1218                default "N,HT" if TARGET_brcm47xx_mips74k 
    12171219                default "G,LP,N,HT" 
    12181220                help 
     
    12251227                    HT  => HT-PHY 
    12261228                    LCN  => LCN-PHY 
     1229                    LCN40  => LCN40-PHY 
     1230                    AC  => AC-PHY 
    12271231 
    12281232                  Example (keep files for G-PHY only): 
     
    12391243 
    12401244        config PACKAGE_B43_BUSES_BCMA_AND_SSB 
    1241                 depends on !TARGET_brcm47xx_legacy 
     1245                depends on !TARGET_brcm47xx_legacy && !TARGET_brcm47xx_mips74k 
    12421246                bool "BCMA and SSB" 
    12431247 
     
    12471251 
    12481252        config PACKAGE_B43_BUSES_SSB 
     1253                depends on !TARGET_brcm47xx_mips74k 
    12491254                bool "SSB only" 
    12501255 
     
    12691274                  If unsure, say N. 
    12701275 
     1276        config PACKAGE_B43_PHY_G 
     1277                bool "Enable support for G-PHYs" 
     1278                default n if TARGET_brcm47xx_mips74k 
     1279                default y 
     1280                help 
     1281                  Enable support for G-PHY. This includes support for the following devices: 
     1282                  PCI: BCM4306, BCM4311, BCM4318 
     1283                  SoC: BCM5352E, BCM4712 
     1284 
     1285                  If unsure, say Y. 
     1286 
    12711287        config PACKAGE_B43_PHY_N 
    12721288                bool "Enable support for N-PHYs" 
     
    12841300        config PACKAGE_B43_PHY_LP 
    12851301                bool "Enable support for LP-PHYs" 
     1302                default n if TARGET_brcm47xx_mips74k 
    12861303                default y 
    12871304                help 
     
    15061523config-$(CONFIG_PACKAGE_B43_BUSES_BCMA) += B43_BUSES_BCMA 
    15071524config-$(CONFIG_PACKAGE_B43_BUSES_SSB) += B43_BUSES_SSB 
     1525config-$(CONFIG_PACKAGE_B43_PHY_G) += B43_PHY_G 
    15081526config-$(CONFIG_PACKAGE_B43_PHY_N) += B43_PHY_N 
    15091527config-$(CONFIG_PACKAGE_B43_PHY_LP) += B43_PHY_LP 
  • trunk/target/linux/brcm47xx/mips74k/config-default

    r41043 r41594  
    11# CONFIG_ADM6996_PHY is not set 
    22# CONFIG_BCM47XX_SSB is not set 
     3CONFIG_BGMAC=y 
    34# CONFIG_FIXED_PHY is not set 
     5# CONFIG_GPIO_WDT is not set 
     6# CONFIG_SSB is not set 
    47# CONFIG_SSB_DRIVER_EXTIF is not set 
    58# CONFIG_SSB_DRIVER_GIGE is not set 
  • trunk/target/linux/brcm47xx/modules.mk

    r41052 r41594  
    2727define KernelPackage/ocf-ubsec-ssb 
    2828  TITLE:=BCM5365P IPSec Core driver 
    29   DEPENDS:=@TARGET_brcm47xx +kmod-crypto-ocf 
     29  DEPENDS:=@TARGET_brcm47xx @!TARGET_brcm47xx_mips74k +kmod-crypto-ocf 
    3030  KCONFIG:=CONFIG_OCF_UBSEC_SSB 
    3131  FILES:=$(LINUX_DIR)/crypto/ocf/ubsec_ssb/ubsec_ssb.ko 
     
    4343  TITLE:=Broadcom bgmac driver 
    4444  KCONFIG:=CONFIG_BGMAC 
    45   DEPENDS:=@TARGET_brcm47xx 
     45  DEPENDS:=@TARGET_brcm47xx @!TARGET_brcm47xx_legacy 
    4646  SUBMENU:=$(NETWORK_DEVICES_MENU) 
    4747  FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/bgmac.ko 
Note: See TracChangeset for help on using the changeset viewer.