brcm47xx: fix bgmac package

[openwrt/openwrt.git] / target / linux / brcm47xx / modules.mk

diff --git a/target/linux/brcm47xx/modules.mk b/target/linux/brcm47xx/modules.mk
index 94bc6626665c76561e1f5b137981876639056ca9..30478ea9b6a3e039f1d21e14479e7e318140bf39 100644 (file)
--- a/target/linux/brcm47xx/modules.mk
+++ b/target/linux/brcm47xx/modules.mk
@@ -5,47 +5,16 @@
 # See /LICENSE for more information.
 #
 
-define KernelPackage/usb-brcm47xx
-  SUBMENU:=$(USB_MENU)
-  TITLE:=Support for USB on bcm47xx
-  DEPENDS:=@USB_SUPPORT @TARGET_brcm47xx
-  KCONFIG:= \
-       CONFIG_USB_HCD_BCMA \
-       CONFIG_USB_HCD_SSB
-  FILES:= \
-       $(if $(CONFIG_USB_HCD_BCMA),$(LINUX_DIR)/drivers/usb/host/bcma-hcd.ko) \
-       $(if $(CONFIG_USB_HCD_SSB),$(LINUX_DIR)/drivers/usb/host/ssb-hcd.ko)
-  AUTOLOAD:=$(call AutoLoad,19, \
-       $(if $(CONFIG_USB_HCD_BCMA),bcma-hcd) \
-       $(if $(CONFIG_USB_HCD_SSB),ssb-hcd),1)
-  $(call AddDepends/usb)
-endef
-
-$(eval $(call KernelPackage,usb-brcm47xx))
-
-
-define KernelPackage/ocf-ubsec-ssb
-  TITLE:=BCM5365P IPSec Core driver
-  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)
-  $(call AddDepends/crypto)
-endef
-
-define KernelPackage/ocf-ubsec-ssb/description
-  This package contains the OCF driver for the BCM5365p IPSec Core
-endef
-
-$(eval $(call KernelPackage,ocf-ubsec-ssb))
-
 define KernelPackage/bgmac
   TITLE:=Broadcom bgmac driver
-  KCONFIG:=CONFIG_BGMAC
+  KCONFIG:=CONFIG_BGMAC CONFIG_BGMAC_BCMA
   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)
+  FILES:= \
+       $(LINUX_DIR)/drivers/net/ethernet/broadcom/bgmac-bcma.ko \
+       $(LINUX_DIR)/drivers/net/ethernet/broadcom/bgmac-bcma-mdio.ko \
+       $(LINUX_DIR)/drivers/net/ethernet/broadcom/bgmac.ko
+  AUTOLOAD:=$(call AutoProbe,bgmac-bcma)
 endef
 
 define KernelPackage/bgmac/description