X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fkernel%2Flinux%2Fmodules%2Fnetdevices.mk;h=b5dc92f39b66b7d67d342fda0c09cb8c9c0857f1;hp=99944c07a572b799641818b3d46cd0f0822b9e6b;hb=f50cdcbb6df5364c037762131c2a078c0c27c589;hpb=f1341fd5325ef04afe31b7c1142c8b39e75560c6

diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk
index 99944c07a5..b5dc92f39b 100644
--- a/package/kernel/linux/modules/netdevices.mk
+++ b/package/kernel/linux/modules/netdevices.mk
@@ -10,10 +10,10 @@ NETWORK_DEVICES_MENU:=Network Devices
 define KernelPackage/sis190
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=SiS 190 Fast/Gigabit Ethernet support
-  DEPENDS:=@PCI_SUPPORT
+  DEPENDS:=@PCI_SUPPORT +kmod-mii
   KCONFIG:=CONFIG_SIS190
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/sis/sis190.ko
-  AUTOLOAD:=$(call AutoLoad,50,sis190)
+  AUTOLOAD:=$(call AutoProbe,sis190)
 endef
 
 $(eval $(call KernelPackage,sis190))
@@ -27,7 +27,7 @@ define KernelPackage/skge
 	CONFIG_SKGE_DEBUG=n \
 	CONFIG_SKGE_GENESIS=n
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/marvell/skge.ko
-  AUTOLOAD:=$(call AutoLoad,50,skge)
+  AUTOLOAD:=$(call AutoProbe,skge)
 endef
 
 $(eval $(call KernelPackage,skge))
@@ -39,7 +39,7 @@ define KernelPackage/atl2
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_ATL2
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/atheros/atlx/atl2.ko
-  AUTOLOAD:=$(call AutoLoad,50,atl2)
+  AUTOLOAD:=$(call AutoProbe,atl2)
 endef
 
 $(eval $(call KernelPackage,atl2))
@@ -48,10 +48,10 @@ $(eval $(call KernelPackage,atl2))
 define KernelPackage/atl1
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Atheros L1 Gigabit Ethernet support
-  DEPENDS:=@PCI_SUPPORT
+  DEPENDS:=@PCI_SUPPORT +kmod-mii
   KCONFIG:=CONFIG_ATL1
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/atheros/atlx/atl1.ko
-  AUTOLOAD:=$(call AutoLoad,50,atl1)
+  AUTOLOAD:=$(call AutoProbe,atl1)
 endef
 
 $(eval $(call KernelPackage,atl1))
@@ -63,7 +63,7 @@ define KernelPackage/atl1c
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_ATL1C
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/atheros/atl1c/atl1c.ko
-  AUTOLOAD:=$(call AutoLoad,50,atl1c)
+  AUTOLOAD:=$(call AutoProbe,atl1c)
 endef
 
 $(eval $(call KernelPackage,atl1c))
@@ -75,7 +75,7 @@ define KernelPackage/atl1e
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_ATL1E
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/atheros/atl1e/atl1e.ko
-  AUTOLOAD:=$(call AutoLoad,50,atl1e)
+  AUTOLOAD:=$(call AutoProbe,atl1e)
 endef
 
 $(eval $(call KernelPackage,atl1e))
@@ -95,17 +95,33 @@ endef
 
 $(eval $(call KernelPackage,libphy))
 
+define KernelPackage/mii
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=MII library
+  KCONFIG:=CONFIG_MII
+  FILES:=$(LINUX_DIR)/drivers/net/mii.ko
+  AUTOLOAD:=$(call AutoLoad,15,mii,1)
+endef
+
+define KernelPackage/mii/description
+  MII library
+endef
+
+$(eval $(call KernelPackage,mii))
+
 
 define KernelPackage/et131x
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Agere ET131x Gigabit Ethernet driver
   URL:=http://sourceforge.net/projects/et131x
-  FILES:=$(LINUX_DIR)/drivers/staging/et131x/et131x.$(LINUX_KMOD_SUFFIX)
+  FILES:= \
+	$(LINUX_DIR)/drivers/staging/et131x/et131x.ko@lt3.18 \
+	$(LINUX_DIR)/drivers/net/ethernet/agere/et131x.ko@ge3.18
   KCONFIG:= \
 	CONFIG_ET131X \
 	CONFIG_ET131X_DEBUG=n
   DEPENDS:=@PCI_SUPPORT +kmod-libphy
-  AUTOLOAD:=$(call AutoLoad,70,et131x)
+  AUTOLOAD:=$(call AutoProbe,et131x)
 endef
 
 define KernelPackage/et131x/description
@@ -115,6 +131,24 @@ endef
 $(eval $(call KernelPackage,et131x))
 
 
+define KernelPackage/gw16083
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Gateworks Ventana Ethernet Expansion Mezzanine driver
+  URL:=http://www.gateworks.com
+  FILES:=$(LINUX_DIR)/drivers/net/phy/gw16083.ko
+  KCONFIG:=CONFIG_GATEWORKS_GW16083
+  DEPENDS:=@TARGET_imx6 @PCI_SUPPORT +kmod-libphy +kmod-igb
+  AUTOLOAD:=$(call AutoLoad,36,gw16083)
+endef
+
+define KernelPackage/gw16083/description
+ This package contains the gw16083 kernel module for supporting the Gateworks
+ Ventana Ethernet Expansion Mezzanine.
+endef
+
+$(eval $(call KernelPackage,gw16083))
+
+
 define KernelPackage/swconfig
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=switch configuration API
@@ -219,7 +253,7 @@ define KernelPackage/r6040
   KCONFIG:=CONFIG_R6040 \
 		CONFIG_R6040_NAPI=y
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/rdc/r6040.ko
-  AUTOLOAD:=$(call AutoLoad,99,r6040)
+  AUTOLOAD:=$(call AutoProbe,r6040)
 endef
 
 define KernelPackage/r6040/description
@@ -232,10 +266,10 @@ $(eval $(call KernelPackage,r6040))
 define KernelPackage/sis900
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=SiS 900 Ethernet support
-  DEPENDS:=@PCI_SUPPORT
+  DEPENDS:=@PCI_SUPPORT +kmod-mii
   KCONFIG:=CONFIG_SIS900
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/sis/sis900.ko
-  AUTOLOAD:=$(call AutoLoad,50,sis900)
+  AUTOLOAD:=$(call AutoProbe,sis900)
 endef
 
 define KernelPackage/sis900/description
@@ -251,7 +285,7 @@ define KernelPackage/sky2
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_SKY2
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/marvell/sky2.ko
-  AUTOLOAD:=$(call AutoLoad,50,sky2)
+  AUTOLOAD:=$(call AutoProbe,sky2)
 endef
 
 define KernelPackage/sky2/description
@@ -270,11 +304,11 @@ $(eval $(call KernelPackage,sky2))
 define KernelPackage/via-rhine
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Via Rhine ethernet support
-  DEPENDS:=@PCI_SUPPORT
+  DEPENDS:=@PCI_SUPPORT +kmod-mii
   KCONFIG:=CONFIG_VIA_RHINE \
     CONFIG_VIA_RHINE_MMIO=y
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/via/via-rhine.ko
-  AUTOLOAD:=$(call AutoLoad,50,via-rhine)
+  AUTOLOAD:=$(call AutoProbe,via-rhine)
 endef
 
 define KernelPackage/via-rhine/description
@@ -290,7 +324,7 @@ define KernelPackage/via-velocity
   DEPENDS:=@TARGET_ixp4xx||TARGET_mpc83xx||PCI_SUPPORT +kmod-lib-crc-ccitt
   KCONFIG:=CONFIG_VIA_VELOCITY
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/via/via-velocity.ko
-  AUTOLOAD:=$(call AutoLoad,50,via-velocity)
+  AUTOLOAD:=$(call AutoProbe,via-velocity)
 endef
 
 define KernelPackage/via-velocity/description
@@ -303,14 +337,14 @@ $(eval $(call KernelPackage,via-velocity))
 define KernelPackage/8139too
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support
-  DEPENDS:=@PCI_SUPPORT
+  DEPENDS:=@PCI_SUPPORT +kmod-mii
   KCONFIG:=CONFIG_8139TOO \
     CONFIG_8139TOO_PIO=y \
     CONFIG_8139TOO_TUNE_TWISTER=n \
     CONFIG_8139TOO_8129=n \
     CONFIG_8139_OLD_RX_RESET=n
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/realtek/8139too.ko
-  AUTOLOAD:=$(call AutoLoad,50,8139too)
+  AUTOLOAD:=$(call AutoProbe,8139too)
 endef
 
 define KernelPackage/8139too/description
@@ -323,10 +357,10 @@ $(eval $(call KernelPackage,8139too))
 define KernelPackage/8139cp
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=RealTek RTL-8139C+ PCI Fast Ethernet Adapter kernel support
-  DEPENDS:=@PCI_SUPPORT
+  DEPENDS:=@PCI_SUPPORT +kmod-mii
   KCONFIG:=CONFIG_8139CP
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/realtek/8139cp.ko
-  AUTOLOAD:=$(call AutoLoad,50,8139cp)
+  AUTOLOAD:=$(call AutoProbe,8139cp)
 endef
 
 define KernelPackage/8139cp/description
@@ -339,12 +373,12 @@ $(eval $(call KernelPackage,8139cp))
 define KernelPackage/r8169
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=RealTek RTL-8169 PCI Gigabit Ethernet Adapter kernel support
-  DEPENDS:=@PCI_SUPPORT
+  DEPENDS:=@PCI_SUPPORT +kmod-mii +r8169-firmware
   KCONFIG:=CONFIG_R8169 \
     CONFIG_R8169_NAPI=y \
     CONFIG_R8169_VLAN=n
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/realtek/r8169.ko
-  AUTOLOAD:=$(call AutoLoad,50,r8169)
+  AUTOLOAD:=$(call AutoProbe,r8169)
 endef
 
 define KernelPackage/r8169/description
@@ -362,7 +396,7 @@ define KernelPackage/ne2k-pci
   FILES:= \
 	$(LINUX_DIR)/drivers/net/ethernet/8390/ne2k-pci.ko \
 	$(LINUX_DIR)/drivers/net/ethernet/8390/8390.ko
-  AUTOLOAD:=$(call AutoLoad,50,8390 ne2k-pci)
+  AUTOLOAD:=$(call AutoProbe,8390 ne2k-pci)
 endef
 
 define KernelPackage/ne2k-pci/description
@@ -375,10 +409,10 @@ $(eval $(call KernelPackage,ne2k-pci))
 define KernelPackage/e100
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Intel(R) PRO/100+ cards kernel support
-  DEPENDS:=@PCI_SUPPORT
+  DEPENDS:=@PCI_SUPPORT +kmod-mii
   KCONFIG:=CONFIG_E100
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/e100.ko
-  AUTOLOAD:=$(call AutoLoad,50,e100)
+  AUTOLOAD:=$(call AutoProbe,e100)
 endef
 
 define KernelPackage/e100/description
@@ -416,10 +450,10 @@ $(eval $(call KernelPackage,e1000))
 define KernelPackage/e1000e
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Intel(R) PRO/1000 PCIe cards kernel support
-  DEPENDS:=@PCIE_SUPPORT +(!LINUX_3_3&&!LINUX_3_6&&!LINUX_3_7):kmod-ptp
+  DEPENDS:=@PCIE_SUPPORT +kmod-ptp
   KCONFIG:=CONFIG_E1000E
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/e1000e/e1000e.ko
-  AUTOLOAD:=$(call AutoLoad,50,e1000e)
+  AUTOLOAD:=$(call AutoProbe,e1000e)
 endef
 
 define KernelPackage/e1000e/description
@@ -429,10 +463,28 @@ endef
 $(eval $(call KernelPackage,e1000e))
 
 
+define KernelPackage/igb
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Intel(R) 82575/82576 PCI-Express Gigabit Ethernet support
+  DEPENDS:=@PCI_SUPPORT +kmod-i2c-algo-bit +kmod-ptp
+  KCONFIG:=CONFIG_IGB \
+    CONFIG_IGB_HWMON=n \
+    CONFIG_IGB_DCA=n
+  FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/igb/igb.ko
+  AUTOLOAD:=$(call AutoLoad,35,igb)
+endef
+
+define KernelPackage/igb/description
+ Kernel modules for Intel(R) 82575/82576 PCI-Express Gigabit Ethernet adapters.
+endef
+
+$(eval $(call KernelPackage,igb))
+
+
 define KernelPackage/b44
   TITLE:=Broadcom 44xx driver
   KCONFIG:=CONFIG_B44
-  DEPENDS:=@PCI_SUPPORT +!TARGET_brcm47xx:kmod-ssb
+  DEPENDS:=@PCI_SUPPORT @!TARGET_brcm47xx_mips74k +!TARGET_brcm47xx:kmod-ssb +kmod-mii +(!LINUX_3_10&&!LINUX_3_13):kmod-libphy
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/b44.ko
   AUTOLOAD:=$(call AutoLoad,19,b44,1)
@@ -448,10 +500,10 @@ $(eval $(call KernelPackage,b44))
 define KernelPackage/3c59x
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=3Com 3c590/3c900 series (592/595/597) Vortex/Boomerang
-  DEPENDS:=@PCI_SUPPORT
+  DEPENDS:=@PCI_SUPPORT +kmod-mii
   KCONFIG:=CONFIG_VORTEX
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/3com/3c59x.ko
-  AUTOLOAD:=$(call AutoLoad,50,3c59x)
+  AUTOLOAD:=$(call AutoProbe,3c59x)
 endef
 
 define KernelPackage/3c59x/description
@@ -470,10 +522,10 @@ $(eval $(call KernelPackage,3c59x))
 define KernelPackage/pcnet32
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=AMD PCnet32 PCI support
-  DEPENDS:=@(PCI_SUPPORT||TARGET_malta)
+  DEPENDS:=@(PCI_SUPPORT||TARGET_malta) +kmod-mii
   KCONFIG:=CONFIG_PCNET32
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/amd/pcnet32.ko
-  AUTOLOAD:=$(call AutoLoad,50,pcnet32)
+  AUTOLOAD:=$(call AutoProbe,pcnet32)
 endef
 
 define KernelPackage/pcnet32/description
@@ -486,7 +538,7 @@ $(eval $(call KernelPackage,pcnet32))
 define KernelPackage/tg3
   TITLE:=Broadcom Tigon3 Gigabit Ethernet
   KCONFIG:=CONFIG_TIGON3
-  DEPENDS:=+!TARGET_brcm47xx:kmod-libphy +!LINUX_3_3:kmod-hwmon-core +(LINUX_3_8||LINUX_3_9||LINUX_3_10):kmod-ptp
+  DEPENDS:=+!TARGET_brcm47xx:kmod-libphy +kmod-hwmon-core +kmod-ptp
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/tg3.ko
   AUTOLOAD:=$(call AutoLoad,19,tg3,1)
@@ -550,7 +602,7 @@ define KernelPackage/gigaset
     $(LINUX_DIR)/drivers/isdn/gigaset/bas_gigaset.ko \
     $(LINUX_DIR)/drivers/isdn/gigaset/ser_gigaset.ko \
     $(LINUX_DIR)/drivers/isdn/gigaset/usb_gigaset.ko
-  AUTOLOAD:=$(call AutoLoad,50,gigaset bas_gigaset ser_gigaset usb_gigaset)
+  AUTOLOAD:=$(call AutoProbe,gigaset bas_gigaset ser_gigaset usb_gigaset)
 endef
 
 define KernelPackage/gigaset/description
@@ -568,7 +620,7 @@ define KernelPackage/macvlan
   TITLE:=MAC-VLAN support
   KCONFIG:=CONFIG_MACVLAN
   FILES:=$(LINUX_DIR)/drivers/net/macvlan.ko
-  AUTOLOAD:=$(call AutoLoad,50,macvlan)
+  AUTOLOAD:=$(call AutoProbe,macvlan)
 endef
 
 define KernelPackage/macvlan/description
@@ -581,7 +633,7 @@ $(eval $(call KernelPackage,macvlan))
 
 define KernelPackage/tulip
   TITLE:=Tulip family network device support
-  DEPENDS:=@PCI_SUPPORT
+  DEPENDS:=@PCI_SUPPORT +kmod-mii
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   KCONFIG:= \
     CONFIG_NET_TULIP=y \
@@ -602,7 +654,7 @@ define KernelPackage/tulip
 	$(LINUX_DIR)/drivers/net/ethernet/dec/tulip/dmfe.ko \
 	$(LINUX_DIR)/drivers/net/ethernet/dec/tulip/uli526x.ko \
 	$(LINUX_DIR)/drivers/net/ethernet/dec/tulip/winbond-840.ko
-  AUTOLOAD:=$(call AutoLoad,50,tulip)
+  AUTOLOAD:=$(call AutoProbe,tulip)
 endef
 
 define KernelPackage/tulip/description
@@ -620,7 +672,7 @@ define KernelPackage/solos-pci
   DEPENDS:=@PCI_SUPPORT +kmod-atm
   KCONFIG:=CONFIG_ATM_SOLOS
   FILES:=$(LINUX_DIR)/drivers/atm/solos-pci.ko
-  AUTOLOAD:=$(call AutoLoad,50,solos-pci)
+  AUTOLOAD:=$(call AutoProbe,solos-pci)
 endef
 
 define KernelPackage/solos-pci/description
@@ -666,7 +718,7 @@ $(eval $(call KernelPackage,ifb))
 define KernelPackage/dm9000
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Davicom 9000 Ethernet support
-  DEPENDS:=@PCI_SUPPORT
+  DEPENDS:=@PCI_SUPPORT +kmod-mii
   KCONFIG:=CONFIG_DM9000 \
     CONFIG_DM9000_DEBUGLEVEL=4 \
     CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL=y
@@ -687,7 +739,7 @@ define KernelPackage/forcedeth
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_FORCEDETH
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/nvidia/forcedeth.ko
-  AUTOLOAD:=$(call AutoLoad,50,forcedeth)
+  AUTOLOAD:=$(call AutoProbe,forcedeth)
 endef
 
 define KernelPackage/forcedeth/description
@@ -734,7 +786,7 @@ define KernelPackage/gianfar
   DEPENDS:=@TARGET_mpc85xx +kmod-fsl-pq-mdio
   KCONFIG:=CONFIG_GIANFAR
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/freescale/gianfar_driver.ko
-  AUTOLOAD:=$(call AutoLoad,50,gianfar_driver)
+  AUTOLOAD:=$(call AutoProbe,gianfar_driver)
 endef
 
 define KernelPackage/gianfar/description
@@ -742,3 +794,19 @@ define KernelPackage/gianfar/description
 endef
 
 $(eval $(call KernelPackage,gianfar))
+
+
+define KernelPackage/vmxnet3
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=VMware VMXNET3 ethernet driver 
+  DEPENDS:=@PCI_SUPPORT
+  KCONFIG:=CONFIG_VMXNET3
+  FILES:=$(LINUX_DIR)/drivers/net/vmxnet3/vmxnet3.ko
+  AUTOLOAD:=$(call AutoLoad,35,vmxnet3)
+endef
+
+define KernelPackage/vmxnet3/description
+ Kernel modules for VMware VMXNET3 ethernet adapters.
+endef
+
+$(eval $(call KernelPackage,vmxnet3))