Author: hauke Date: 2014-07-12 17:39:31 +0200 (Sat, 12 Jul 2014) New Revision: 41594
Modified: trunk/package/kernel/linux/modules/netdevices.mk trunk/package/kernel/mac80211/Makefile trunk/target/linux/brcm47xx/mips74k/config-default trunk/target/linux/brcm47xx/modules.mk Log: 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 <[email protected]> Modified: trunk/package/kernel/linux/modules/netdevices.mk =================================================================== --- trunk/package/kernel/linux/modules/netdevices.mk 2014-07-12 15:37:34 UTC (rev 41593) +++ trunk/package/kernel/linux/modules/netdevices.mk 2014-07-12 15:39:31 UTC (rev 41594) @@ -446,7 +446,7 @@ define KernelPackage/b44 TITLE:=Broadcom 44xx driver KCONFIG:=CONFIG_B44 - DEPENDS:=@PCI_SUPPORT +!TARGET_brcm47xx:kmod-ssb +kmod-mii +LINUX_3_14:kmod-libphy + DEPENDS:=@PCI_SUPPORT @!TARGET_brcm47xx_mips74k +!TARGET_brcm47xx:kmod-ssb +kmod-mii +LINUX_3_14:kmod-libphy SUBMENU:=$(NETWORK_DEVICES_MENU) FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/b44.ko AUTOLOAD:=$(call AutoLoad,19,b44,1) Modified: trunk/package/kernel/mac80211/Makefile =================================================================== --- trunk/package/kernel/mac80211/Makefile 2014-07-12 15:37:34 UTC (rev 41593) +++ trunk/package/kernel/mac80211/Makefile 2014-07-12 15:39:31 UTC (rev 41594) @@ -1200,7 +1200,8 @@ string "Core revisions to include" depends on B43_FW_SQUASH default "5,6,7,8,9,10,11,13,15" if TARGET_brcm47xx_legacy - default "5,6,7,8,9,10,11,13,15,16,29" + default "16,28,29" if TARGET_brcm47xx_mips74k + default "5,6,7,8,9,10,11,13,15,16,28,29" help This is a comma seperated list of core revision numbers. @@ -1214,6 +1215,7 @@ string "PHY types to include" depends on B43_FW_SQUASH default "G,LP" if TARGET_brcm47xx_legacy + default "N,HT" if TARGET_brcm47xx_mips74k default "G,LP,N,HT" help This is a comma seperated list of PHY types: @@ -1224,6 +1226,8 @@ N => N-PHY HT => HT-PHY LCN => LCN-PHY + LCN40 => LCN40-PHY + AC => AC-PHY Example (keep files for G-PHY only): G @@ -1238,7 +1242,7 @@ This allows choosing buses that b43 should support. config PACKAGE_B43_BUSES_BCMA_AND_SSB - depends on !TARGET_brcm47xx_legacy + depends on !TARGET_brcm47xx_legacy && !TARGET_brcm47xx_mips74k bool "BCMA and SSB" config PACKAGE_B43_BUSES_BCMA @@ -1246,6 +1250,7 @@ bool "BCMA only" config PACKAGE_B43_BUSES_SSB + depends on !TARGET_brcm47xx_mips74k bool "SSB only" endchoice @@ -1268,6 +1273,17 @@ If unsure, say N. + config PACKAGE_B43_PHY_G + bool "Enable support for G-PHYs" + default n if TARGET_brcm47xx_mips74k + default y + help + Enable support for G-PHY. This includes support for the following devices: + PCI: BCM4306, BCM4311, BCM4318 + SoC: BCM5352E, BCM4712 + + If unsure, say Y. + config PACKAGE_B43_PHY_N bool "Enable support for N-PHYs" default n if TARGET_brcm47xx_legacy @@ -1283,6 +1299,7 @@ config PACKAGE_B43_PHY_LP bool "Enable support for LP-PHYs" + default n if TARGET_brcm47xx_mips74k default y help Enable support for LP-PHY. This includes support for the following devices: @@ -1505,6 +1522,7 @@ 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_G) += B43_PHY_G 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 Modified: trunk/target/linux/brcm47xx/mips74k/config-default =================================================================== --- trunk/target/linux/brcm47xx/mips74k/config-default 2014-07-12 15:37:34 UTC (rev 41593) +++ trunk/target/linux/brcm47xx/mips74k/config-default 2014-07-12 15:39:31 UTC (rev 41594) @@ -1,6 +1,9 @@ # CONFIG_ADM6996_PHY is not set # CONFIG_BCM47XX_SSB is not set +CONFIG_BGMAC=y # CONFIG_FIXED_PHY is not set +# CONFIG_GPIO_WDT is not set +# CONFIG_SSB is not set # CONFIG_SSB_DRIVER_EXTIF is not set # CONFIG_SSB_DRIVER_GIGE is not set # CONFIG_SSB_DRIVER_MIPS is not set Modified: trunk/target/linux/brcm47xx/modules.mk =================================================================== --- trunk/target/linux/brcm47xx/modules.mk 2014-07-12 15:37:34 UTC (rev 41593) +++ trunk/target/linux/brcm47xx/modules.mk 2014-07-12 15:39:31 UTC (rev 41594) @@ -26,7 +26,7 @@ define KernelPackage/ocf-ubsec-ssb TITLE:=BCM5365P IPSec Core driver - DEPENDS:=@TARGET_brcm47xx +kmod-crypto-ocf + DEPENDS:=@TARGET_brcm47xx @!TARGET_brcm47xx_mips74k +kmod-crypto-ocf KCONFIG:=CONFIG_OCF_UBSEC_SSB FILES:=$(LINUX_DIR)/crypto/ocf/ubsec_ssb/ubsec_ssb.ko AUTOLOAD:=$(call AutoLoad,10,ubsec_ssb) @@ -42,7 +42,7 @@ define KernelPackage/bgmac TITLE:=Broadcom bgmac driver KCONFIG:=CONFIG_BGMAC - DEPENDS:=@TARGET_brcm47xx + DEPENDS:=@TARGET_brcm47xx @!TARGET_brcm47xx_legacy SUBMENU:=$(NETWORK_DEVICES_MENU) FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/bgmac.ko AUTOLOAD:=$(call AutoLoad,19,bgmac,1) _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
