revert bad change

[openwrt.git] / package / kernel / modules / netdevices.mk

diff --git a/package/kernel/modules/netdevices.mk b/package/kernel/modules/netdevices.mk
index 60311b6..ac9795b 100644 (file)
--- a/package/kernel/modules/netdevices.mk
+++ b/package/kernel/modules/netdevices.mk
@@ -1,19 +1,217 @@
 #
 #

-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id$

 
 NETWORK_DEVICES_MENU:=Network Devices
 
 
 NETWORK_DEVICES_MENU:=Network Devices
 

+define KernelPackage/sis190
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=SiS 190 Fast/Gigabit Ethernet support
+  DEPENDS:=@TARGET_x86
+  KCONFIG:=CONFIG_SIS190
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ethernet/sis/sis190.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/sis190.ko
+  endif
+  AUTOLOAD:=$(call AutoLoad,50,sis190)
+endef
+ 
+$(eval $(call KernelPackage,sis190))
+
+define KernelPackage/skge
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=SysKonnect Yukon support
+  DEPENDS:=@TARGET_x86
+  KCONFIG:=CONFIG_SKGE \
+    CONFIG_SKGE_DEBUG=n
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ethernet/marvell/skge.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/skge.ko
+  endif
+  AUTOLOAD:=$(call AutoLoad,50,skge)
+endef
+
+$(eval $(call KernelPackage,skge))
+
+define KernelPackage/atl2
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Atheros L2 Fast Ethernet support
+  DEPENDS:=@PCI_SUPPORT
+  KCONFIG:=CONFIG_ATL2
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ethernet/atheros/atlx/atl2.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/atlx/atl2.ko
+  endif
+  AUTOLOAD:=$(call AutoLoad,50,atl2)
+endef
+
+$(eval $(call KernelPackage,atl2))
+
+define KernelPackage/atl1
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Atheros L1 Gigabit Ethernet support
+  DEPENDS:=@PCI_SUPPORT
+  KCONFIG:=CONFIG_ATL1
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ethernet/atheros/atlx/atl1.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/atlx/atl1.ko
+  endif
+  AUTOLOAD:=$(call AutoLoad,50,atl1)
+endef
+
+$(eval $(call KernelPackage,atl1))
+
+define KernelPackage/atl1c
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Atheros L1C
+  DEPENDS:=@PCI_SUPPORT
+  KCONFIG:=CONFIG_ATL1C
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ethernet/atheros/atl1c/atl1c.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/atl1c/atl1c.ko
+  endif
+  AUTOLOAD:=$(call AutoLoad,50,atl1c)
+endef
+
+$(eval $(call KernelPackage,atl1c))
+
+define KernelPackage/atl1e
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Atheros L1E
+  DEPENDS:=@PCI_SUPPORT
+  KCONFIG:=CONFIG_ATL1E
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ethernet/atheros/atl1e/atl1e.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/atl1e/atl1e.ko
+  endif
+  AUTOLOAD:=$(call AutoLoad,50,atl1e)
+endef
+
+$(eval $(call KernelPackage,atl1e))
+
+define KernelPackage/libphy
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=PHY library
+  KCONFIG:=CONFIG_PHYLIB
+  FILES:=$(LINUX_DIR)/drivers/net/phy/libphy.ko
+  AUTOLOAD:=$(call AutoLoad,40,libphy)
+endef
+
+define KernelPackage/libphy/description
+  PHY library
+endef
+
+$(eval $(call KernelPackage,libphy))
+
+define KernelPackage/swconfig
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=switch configuration API
+  DEPENDS:=+kmod-libphy
+  KCONFIG:=CONFIG_SWCONFIG
+  FILES:=$(LINUX_DIR)/drivers/net/phy/swconfig.ko
+  AUTOLOAD:=$(call AutoLoad,41,swconfig)
+endef
+
+define KernelPackage/swconfig/description
+  Switch configuration API module
+endef
+
+$(eval $(call KernelPackage,swconfig))
+
+define KernelPackage/mvswitch
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Marvell 88E6060 switch support
+  DEPENDS:=+kmod-swconfig @!LINUX_3_1&&!LINUX_3_2&&!LINUX_3_3||BROKEN
+  KCONFIG:=CONFIG_MVSWITCH_PHY
+  FILES:=$(LINUX_DIR)/drivers/net/phy/mvswitch.ko
+  AUTOLOAD:=$(call AutoLoad,41,mvswitch)
+endef
+
+define KernelPackage/mvswitch/description
+  Marvell 88E6060 switch support
+endef
+
+$(eval $(call KernelPackage,mvswitch))
+
+define KernelPackage/switch-ip17xx
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=IC+ IP17XX switch support
+  DEPENDS:=+kmod-swconfig
+  KCONFIG:=CONFIG_IP17XX_PHY
+  FILES:=$(LINUX_DIR)/drivers/net/phy/ip17xx.ko
+  AUTOLOAD:=$(call AutoLoad,42,ip17xx)
+endef
+
+define KernelPackage/switch-ip17xx/description
+  IC+ IP175C/IP178C switch support
+endef
+
+$(eval $(call KernelPackage,switch-ip17xx))
+
+define KernelPackage/switch-rtl8366-smi
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Realtek RTL8366 SMI switch interface support
+  DEPENDS:=@GPIO_SUPPORT +kmod-swconfig
+  KCONFIG:=CONFIG_RTL8366_SMI
+  FILES:=$(LINUX_DIR)/drivers/net/phy/rtl8366_smi.ko
+  AUTOLOAD:=$(call AutoLoad,42,rtl8366_smi)
+endef
+
+define KernelPackage/switch-rtl8366_smi/description
+  Realtek RTL8366 series SMI switch interface support
+endef
+
+$(eval $(call KernelPackage,switch-rtl8366-smi))
+
+define KernelPackage/switch-rtl8366rb
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Realtek RTL8366RB switch support
+  DEPENDS:=+kmod-switch-rtl8366-smi
+  KCONFIG:=CONFIG_RTL8366RB_PHY
+  FILES:=$(LINUX_DIR)/drivers/net/phy/rtl8366rb.ko
+  AUTOLOAD:=$(call AutoLoad,43,rtl8366rb)
+endef
+
+define KernelPackage/switch-rtl8366rb/description
+  Realtek RTL8366RB switch support
+endef
+
+$(eval $(call KernelPackage,switch-rtl8366rb))
+
+define KernelPackage/switch-rtl8366s
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Realtek RTL8366S switch support
+  DEPENDS:=+kmod-switch-rtl8366-smi
+  KCONFIG:=CONFIG_RTL8366S_PHY
+  FILES:=$(LINUX_DIR)/drivers/net/phy/rtl8366s.ko
+  AUTOLOAD:=$(call AutoLoad,43,rtl8366s)
+endef
+
+define KernelPackage/switch-rtl8366s/description
+  Realtek RTL8366S switch support
+endef
+
+$(eval $(call KernelPackage,switch-rtl8366s))
+

 define KernelPackage/natsemi
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=National Semiconductor DP8381x series
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_NATSEMI
 define KernelPackage/natsemi
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=National Semiconductor DP8381x series
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_NATSEMI

-  FILES:=$(LINUX_DIR)/drivers/net/natsemi.$(LINUX_KMOD_SUFFIX)
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ethernet/natsemi/natsemi.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/natsemi.ko
+  endif

   AUTOLOAD:=$(call AutoLoad,20,natsemi)
 endef
 
   AUTOLOAD:=$(call AutoLoad,20,natsemi)
 endef
 


@@ -28,9 +226,14 @@ $(eval $(call KernelPackage,natsemi))
 define KernelPackage/r6040
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=RDC Fast-Ethernet support
 define KernelPackage/r6040
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=RDC Fast-Ethernet support

-  DEPENDS:=@TARGET_rdc
-  KCONFIG:=CONFIG_R6040
-  FILES:=$(LINUX_DIR)/drivers/net/r6040.$(LINUX_KMOD_SUFFIX)
+  DEPENDS:=@TARGET_rdc +kmod-libphy
+  KCONFIG:=CONFIG_R6040 \
+               CONFIG_R6040_NAPI=y
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ethernet/rdc/r6040.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/r6040.ko
+  endif

   AUTOLOAD:=$(call AutoLoad,99,r6040)
 endef
 
   AUTOLOAD:=$(call AutoLoad,99,r6040)
 endef
 


@@ -46,7 +249,11 @@ define KernelPackage/sis900
   TITLE:=SiS 900 Ethernet support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_SIS900
   TITLE:=SiS 900 Ethernet support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_SIS900

-  FILES:=$(LINUX_DIR)/drivers/net/sis900.$(LINUX_KMOD_SUFFIX)
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ethernet/sis/sis900.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/sis900.ko
+  endif

   AUTOLOAD:=$(call AutoLoad,50,sis900)
 endef
 
   AUTOLOAD:=$(call AutoLoad,50,sis900)
 endef
 


@@ -60,9 +267,12 @@ $(eval $(call KernelPackage,sis900))
 define KernelPackage/sky2
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=SysKonnect Yukon2 support
 define KernelPackage/sky2
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=SysKonnect Yukon2 support

-  DEPENDS:=@TARGET_x86

   KCONFIG:=CONFIG_SKY2
   KCONFIG:=CONFIG_SKY2

-  FILES:=$(LINUX_DIR)/drivers/net/sky2.$(LINUX_KMOD_SUFFIX)
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ethernet/marvell/sky2.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/sky2.ko
+  endif

   AUTOLOAD:=$(call AutoLoad,50,sky2)
 endef
 
   AUTOLOAD:=$(call AutoLoad,50,sky2)
 endef
 


@@ -83,8 +293,13 @@ define KernelPackage/via-rhine
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Via Rhine ethernet support
   DEPENDS:=@TARGET_x86
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Via Rhine ethernet support
   DEPENDS:=@TARGET_x86

-  KCONFIG:=CONFIG_VIA_RHINE
-  FILES:=$(LINUX_DIR)/drivers/net/via-rhine.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_VIA_RHINE \
+    CONFIG_VIA_RHINE_MMIO=y
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ethernet/via/via-rhine.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/via-rhine.ko
+  endif

   AUTOLOAD:=$(call AutoLoad,50,via-rhine)
 endef
 
   AUTOLOAD:=$(call AutoLoad,50,via-rhine)
 endef
 


@@ -98,9 +313,13 @@ $(eval $(call KernelPackage,via-rhine))
 define KernelPackage/via-velocity
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=VIA Velocity Gigabit Ethernet Adapter kernel support
 define KernelPackage/via-velocity
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=VIA Velocity Gigabit Ethernet Adapter kernel support

-  DEPENDS:=@TARGET_ixp4xx
+  DEPENDS:=@TARGET_ixp4xx||TARGET_mpc83xx||TARGET_x86 +kmod-lib-crc-ccitt

   KCONFIG:=CONFIG_VIA_VELOCITY
   KCONFIG:=CONFIG_VIA_VELOCITY

-  FILES:=$(LINUX_DIR)/drivers/net/via-velocity.$(LINUX_KMOD_SUFFIX)
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ethernet/via/via-velocity.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/via-velocity.ko
+  endif

   AUTOLOAD:=$(call AutoLoad,50,via-velocity)
 endef
 
   AUTOLOAD:=$(call AutoLoad,50,via-velocity)
 endef
 


@@ -110,13 +329,39 @@ endef
 
 $(eval $(call KernelPackage,via-velocity))
 
 
 $(eval $(call KernelPackage,via-velocity))
 

+define KernelPackage/ixp4xx-eth
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=IXP4xxt Ethernet Adapter kernel support
+  DEPENDS:=@TARGET_ixp4xx
+  KCONFIG:=CONFIG_IXP4XX_ETH
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ethernet/xscale/ixp4xx_eth.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/arm/ixp4xx_eth.ko
+  endif
+  AUTOLOAD:=$(call AutoLoad,50,ixp4xx_eth)
+endef
+
+define KernelPackage/ixp4xx-eth/description
+ Kernel modules for Intel IXP4xx Ethernet chipsets.
+endef
+
+$(eval $(call KernelPackage,ixp4xx-eth))

 
 define KernelPackage/8139too
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support
   DEPENDS:=@TARGET_x86
 
 define KernelPackage/8139too
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support
   DEPENDS:=@TARGET_x86

-  KCONFIG:=CONFIG_8139TOO
-  FILES:=$(LINUX_DIR)/drivers/net/8139too.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_8139TOO \
+    CONFIG_8139TOO_PIO=y \
+    CONFIG_8139TOO_TUNE_TWISTER=n \
+    CONFIG_8139TOO_8129=n \
+    CONFIG_8139_OLD_RX_RESET=n
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ethernet/realtek/8139too.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/8139too.ko
+  endif

   AUTOLOAD:=$(call AutoLoad,50,8139too)
 endef
 
   AUTOLOAD:=$(call AutoLoad,50,8139too)
 endef
 


@@ -127,12 +372,38 @@ endef
 $(eval $(call KernelPackage,8139too))
 
 
 $(eval $(call KernelPackage,8139too))
 
 

+define KernelPackage/8139cp
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=RealTek RTL-8139C+ PCI Fast Ethernet Adapter kernel support
+  DEPENDS:=@TARGET_x86
+  KCONFIG:=CONFIG_8139CP
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ethernet/realtek/8139cp.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/8139cp.ko
+  endif
+  AUTOLOAD:=$(call AutoLoad,50,8139cp)
+endef
+
+define KernelPackage/8139cp/description
+ Kernel module for RealTek RTL-8139C+ PCI Fast Ethernet adapters.
+endef
+
+$(eval $(call KernelPackage,8139cp))
+
+

 define KernelPackage/r8169
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=RealTek RTL-8169 PCI Gigabit Ethernet Adapter kernel support
 define KernelPackage/r8169
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=RealTek RTL-8169 PCI Gigabit Ethernet Adapter kernel support

-  DEPENDS:=@TARGET_x86
-  KCONFIG:=CONFIG_R8169 CONFIG_R8169_NAPI=y CONFIG_R8169_VLAN=n
-  FILES:=$(LINUX_DIR)/drivers/net/r8169.$(LINUX_KMOD_SUFFIX)
+  DEPENDS:=@PCI_SUPPORT
+  KCONFIG:=CONFIG_R8169 \
+    CONFIG_R8169_NAPI=y \
+    CONFIG_R8169_VLAN=n
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ethernet/realtek/r8169.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/r8169.ko
+  endif

   AUTOLOAD:=$(call AutoLoad,50,r8169)
 endef
 
   AUTOLOAD:=$(call AutoLoad,50,r8169)
 endef
 


@@ -148,9 +419,15 @@ define KernelPackage/ne2k-pci
   TITLE:=ne2k-pci Ethernet Adapter kernel support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_NE2K_PCI
   TITLE:=ne2k-pci Ethernet Adapter kernel support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_NE2K_PCI

-  FILES:= \
-       $(LINUX_DIR)/drivers/net/ne2k-pci.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/drivers/net/8390.$(LINUX_KMOD_SUFFIX)
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:= \
+       $(LINUX_DIR)/drivers/net/ethernet/8390/ne2k-pci.ko \
+       $(LINUX_DIR)/drivers/net/ethernet/8390/8390.ko
+  else
+    FILES:= \
+       $(LINUX_DIR)/drivers/net/ne2k-pci.ko \
+       $(LINUX_DIR)/drivers/net/8390.ko
+  endif

   AUTOLOAD:=$(call AutoLoad,50,8390 ne2k-pci)
 endef
 
   AUTOLOAD:=$(call AutoLoad,50,8390 ne2k-pci)
 endef
 


@@ -166,7 +443,11 @@ define KernelPackage/e100
   TITLE:=Intel(R) PRO/100+ cards kernel support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_E100
   TITLE:=Intel(R) PRO/100+ cards kernel support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_E100

-  FILES:=$(LINUX_DIR)/drivers/net/e100.$(LINUX_KMOD_SUFFIX)
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/e100.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/e100.ko
+  endif

   AUTOLOAD:=$(call AutoLoad,50,e100)
 endef
 
   AUTOLOAD:=$(call AutoLoad,50,e100)
 endef
 


@@ -174,31 +455,68 @@ define KernelPackage/e100/description
  Kernel modules for Intel(R) PRO/100+ Ethernet adapters.
 endef
 
  Kernel modules for Intel(R) PRO/100+ Ethernet adapters.
 endef
 

+define KernelPackage/e100/install
+       $(INSTALL_DIR) $(1)/lib/firmware/e100
+       $(foreach file,d101m_ucode.bin d101s_ucode.bin d102e_ucode.bin, \
+               $(TARGET_CROSS)objcopy -Iihex -Obinary $(LINUX_DIR)/firmware/e100/$(file).ihex $(1)/lib/firmware/e100/$(file); \
+       )
+endef
+

 $(eval $(call KernelPackage,e100))
 
 
 define KernelPackage/e1000
   SUBMENU:=$(NETWORK_DEVICES_MENU)
 $(eval $(call KernelPackage,e100))
 
 
 define KernelPackage/e1000
   SUBMENU:=$(NETWORK_DEVICES_MENU)

-  TITLE:=Intel(R) PRO/1000 cards kernel support
-  DEPENDS:=@TARGET_x86
-  KCONFIG:=CONFIG_E1000
-  FILES:=$(LINUX_DIR)/drivers/net/e1000/e1000.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,e1000)
+  TITLE:=Intel(R) PRO/1000 PCI cards kernel support
+  DEPENDS:=@PCI_SUPPORT
+  KCONFIG:=CONFIG_E1000 \
+    CONFIG_E1000_DISABLE_PACKET_SPLIT=n \
+    CONFIG_E1000_NAPI=y
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/e1000/e1000.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/e1000/e1000.ko
+  endif
+  AUTOLOAD:=$(call AutoLoad,35,e1000)

 endef
 
 define KernelPackage/e1000/description
 endef
 
 define KernelPackage/e1000/description

- Kernel modules for Intel(R) PRO/1000 Ethernet adapters.
+ Kernel modules for Intel(R) PRO/1000 PCI Ethernet adapters.

 endef
 
 $(eval $(call KernelPackage,e1000))
 
 
 endef
 
 $(eval $(call KernelPackage,e1000))
 
 

+define KernelPackage/e1000e
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Intel(R) PRO/1000 PCIe cards kernel support
+  DEPENDS:=@PCIE_SUPPORT
+  KCONFIG:=CONFIG_E1000E
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/e1000e/e1000e.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/e1000e/e1000e.ko
+  endif
+  AUTOLOAD:=$(call AutoLoad,50,e1000e)
+endef
+
+define KernelPackage/e1000e/description
+ Kernel modules for Intel(R) PRO/1000 PCIe Ethernet adapters.
+endef
+
+$(eval $(call KernelPackage,e1000e))
+
+

 define KernelPackage/b44
   TITLE:=Broadcom 44xx driver
 define KernelPackage/b44
   TITLE:=Broadcom 44xx driver

-  FILES:=$(LINUX_DIR)/drivers/net/b44.$(LINUX_KMOD_SUFFIX)

   KCONFIG:=CONFIG_B44
   KCONFIG:=CONFIG_B44

-  DEPENDS:=@TARGET_x86 @BROKEN
+  DEPENDS:=@TARGET_x86 +kmod-ssb

   SUBMENU:=$(NETWORK_DEVICES_MENU)
   SUBMENU:=$(NETWORK_DEVICES_MENU)

+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/b44.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/b44.ko
+  endif

   AUTOLOAD:=$(call AutoLoad,50,b44)
 endef
 
   AUTOLOAD:=$(call AutoLoad,50,b44)
 endef
 


@@ -214,7 +532,11 @@ define KernelPackage/3c59x
   TITLE:=3Com 3c590/3c900 series (592/595/597) Vortex/Boomerang
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_VORTEX
   TITLE:=3Com 3c590/3c900 series (592/595/597) Vortex/Boomerang
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_VORTEX

-  FILES:=$(LINUX_DIR)/drivers/net/3c59x.$(LINUX_KMOD_SUFFIX)
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ethernet/3com/3c59x.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/3c59x.ko
+  endif

   AUTOLOAD:=$(call AutoLoad,50,3c59x)
 endef
 
   AUTOLOAD:=$(call AutoLoad,50,3c59x)
 endef
 


@@ -234,9 +556,13 @@ $(eval $(call KernelPackage,3c59x))
 define KernelPackage/pcnet32
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=AMD PCnet32 PCI support
 define KernelPackage/pcnet32
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=AMD PCnet32 PCI support

-  DEPENDS:=@TARGET_x86
+  DEPENDS:=@(TARGET_x86||TARGET_malta)

   KCONFIG:=CONFIG_PCNET32
   KCONFIG:=CONFIG_PCNET32

-  FILES:=$(LINUX_DIR)/drivers/net/pcnet32.$(LINUX_KMOD_SUFFIX)
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ethernet/amd/pcnet32.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/pcnet32.ko
+  endif

   AUTOLOAD:=$(call AutoLoad,50,pcnet32)
 endef
 
   AUTOLOAD:=$(call AutoLoad,50,pcnet32)
 endef
 


@@ -249,15 +575,15 @@ $(eval $(call KernelPackage,pcnet32))
 
 define KernelPackage/tg3
   TITLE:=Broadcom Tigon3 Gigabit Ethernet
 
 define KernelPackage/tg3
   TITLE:=Broadcom Tigon3 Gigabit Ethernet

-  FILES:=$(LINUX_DIR)/drivers/net/tg3.$(LINUX_KMOD_SUFFIX)

   KCONFIG:=CONFIG_TIGON3
   KCONFIG:=CONFIG_TIGON3

-  DEPENDS:=@LINUX_2_6
+  DEPENDS:=+!TARGET_brcm47xx:kmod-libphy @!TARGET_ubicom32

   SUBMENU:=$(NETWORK_DEVICES_MENU)
   SUBMENU:=$(NETWORK_DEVICES_MENU)

+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/tg3.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/tg3.ko
+  endif

   AUTOLOAD:=$(call AutoLoad,50,tg3)
   AUTOLOAD:=$(call AutoLoad,50,tg3)

-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.27)),1)
-  FILES+=$(LINUX_DIR)/drivers/net/phy/libphy.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,40,libphy tg3)
-endif

 endef
 
 define KernelPackage/tg3/description
 endef
 
 define KernelPackage/tg3/description


@@ -280,17 +606,193 @@ endef
 
 $(eval $(call KernelPackage,ssb-gige))
 
 
 $(eval $(call KernelPackage,ssb-gige))
 

+
+define KernelPackage/hfcpci
+  TITLE:=HFC PCI cards (single port) support for mISDN
+  KCONFIG:=CONFIG_MISDN_HFCPCI
+  DEPENDS:=+kmod-misdn
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  FILES:=$(LINUX_DIR)/drivers/isdn/hardware/mISDN/hfcpci.ko
+  AUTOLOAD:=$(call AutoLoad,31,hfcpci)
+endef
+
+define KernelPackage/hfcpci/description
+ Kernel modules for Cologne AG's HFC pci cards (single port)
+ using the mISDN V2 stack.
+endef
+
+$(eval $(call KernelPackage,hfcpci))
+
+

 define KernelPackage/hfcmulti
 define KernelPackage/hfcmulti

-  TITLE:=HFC multiport cards (HFC-4S/8S/E1)
+  TITLE:=HFC multiport cards (HFC-4S/8S/E1) support for mISDN

   KCONFIG:=CONFIG_MISDN_HFCMULTI
   DEPENDS:=+kmod-misdn
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   KCONFIG:=CONFIG_MISDN_HFCMULTI
   DEPENDS:=+kmod-misdn
   SUBMENU:=$(NETWORK_DEVICES_MENU)

-  FILES:=$(LINUX_DIR)/drivers/isdn/hardware/mISDN/hfcmulti.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/isdn/hardware/mISDN/hfcmulti.ko

   AUTOLOAD:=$(call AutoLoad,31,hfcmulti)
 endef
 
 define KernelPackage/hfcmulti/description
   AUTOLOAD:=$(call AutoLoad,31,hfcmulti)
 endef
 
 define KernelPackage/hfcmulti/description

-  HFC multiport cards (HFC-4S/8S/E1) support
+ Kernel modules for Cologne AG's HFC multiport cards (HFC-4S/8S/E1)
+ using the mISDN V2 stack.

 endef
 
 $(eval $(call KernelPackage,hfcmulti))
 endef
 
 $(eval $(call KernelPackage,hfcmulti))

+
+
+define KernelPackage/gigaset
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Siemens Gigaset support for isdn4linux
+  DEPENDS:=@USB_SUPPORT +kmod-isdn4linux +kmod-lib-crc-ccitt +kmod-usb-core
+  URL:=http://gigaset307x.sourceforge.net/
+  KCONFIG:= \
+    CONFIG_ISDN_DRV_GIGASET \
+    CONFIG_GIGASET_BASE \
+    CONFIG_GIGASET_M101 \
+    CONFIG_GIGASET_M105 \
+    CONFIG_GIGASET_UNDOCREQ=y \
+    CONFIG_GIGASET_I4L=y
+  FILES:= \
+    $(LINUX_DIR)/drivers/isdn/gigaset/gigaset.ko \
+    $(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)
+endef
+
+define KernelPackage/gigaset/description
+ This driver supports the Siemens Gigaset SX205/255 family of
+ ISDN DECT bases, including the predecessors Gigaset 3070/3075
+ and 4170/4175 and their T-Com versions Sinus 45isdn and Sinus
+ 721X.
+endef
+
+$(eval $(call KernelPackage,gigaset))
+
+
+define KernelPackage/macvlan
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=MAC-VLAN support
+  KCONFIG:=CONFIG_MACVLAN
+  FILES:=$(LINUX_DIR)/drivers/net/macvlan.ko
+  AUTOLOAD:=$(call AutoLoad,50,macvlan)
+endef
+
+define KernelPackage/macvlan/description
+ A kernel module which allows one to create virtual interfaces that
+ map packets to or from specific MAC addresses to a particular interface.
+endef
+
+$(eval $(call KernelPackage,macvlan))
+
+define KernelPackage/tulip
+  TITLE:=Tulip family network device support
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  KCONFIG:= \
+    CONFIG_NET_TULIP=y \
+    CONFIG_DE2104X \
+    CONFIG_DE2104X_DSL=0 \
+    CONFIG_TULIP \
+    CONFIG_TULIP_MWI=y \
+    CONFIG_TULIP_MMIO=y \
+    CONFIG_TULIP_NAPI=y \
+    CONFIG_TULIP_NAPI_HW_MITIGATION=y \
+    CONFIG_DE4X5 \
+    CONFIG_WINBOND_840 \
+    CONFIG_DM9102 \
+    CONFIG_ULI526X 
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:= \
+       $(LINUX_DIR)/drivers/net/ethernet/dec/tulip/tulip.ko \
+       $(LINUX_DIR)/drivers/net/ethernet/dec/tulip/de2104x.ko \
+       $(LINUX_DIR)/drivers/net/ethernet/dec/tulip/de4x5.ko \
+       $(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
+  else
+    FILES:= \
+       $(LINUX_DIR)/drivers/net/tulip/tulip.ko \
+       $(LINUX_DIR)/drivers/net/tulip/de2104x.ko \
+       $(LINUX_DIR)/drivers/net/tulip/de4x5.ko \
+       $(LINUX_DIR)/drivers/net/tulip/dmfe.ko \
+       $(LINUX_DIR)/drivers/net/tulip/uli526x.ko \
+       $(LINUX_DIR)/drivers/net/tulip/winbond-840.ko
+  endif
+  AUTOLOAD:=$(call AutoLoad,50,tulip)
+endef
+
+define KernelPackage/tulip/description
+ Kernel modules for the Tulip family of network cards,
+ including DECchip Tulip, DIGITAL EtherWORKS, Winbond W89c840,
+ Davicom DM910x/DM980x and ULi M526x controller support.
+endef
+
+$(eval $(call KernelPackage,tulip))
+
+
+define KernelPackage/solos-pci
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Solos ADSL2+ multiport modem
+  DEPENDS:=@TARGET_x86 +kmod-atm
+  KCONFIG:=CONFIG_ATM_SOLOS
+  FILES:=$(LINUX_DIR)/drivers/atm/solos-pci.ko
+  AUTOLOAD:=$(call AutoLoad,50,solos-pci)
+endef
+
+define KernelPackage/solos-pci/description
+ Kernel module for Traverse Technologies' Solos PCI cards
+ and Geos ADSL2+ x86 motherboard.
+endef
+
+$(eval $(call KernelPackage,solos-pci))
+
+define KernelPackage/dummy
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Dummy network device
+  KCONFIG:=CONFIG_DUMMY
+  FILES:=$(LINUX_DIR)/drivers/net/dummy.ko
+  AUTOLOAD:=$(call AutoLoad,34,dummy)
+endef
+
+define KernelPackage/dummy/description
+  The dummy network device
+endef
+
+$(eval $(call KernelPackage,dummy))
+
+define KernelPackage/ifb
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Intermediate Functional Block support
+  KCONFIG:= \
+       CONFIG_IFB \
+       CONFIG_NET_CLS=y
+  FILES:=$(LINUX_DIR)/drivers/net/ifb.ko
+  AUTOLOAD:=$(call AutoLoad,34,ifb)
+endef
+
+define KernelPackage/ifb/description
+  The Intermediate Functional Block
+endef
+
+$(eval $(call KernelPackage,ifb))
+
+define KernelPackage/dm9000
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Davicom 9000 Ethernet support
+  KCONFIG:=CONFIG_DM9000 \
+    CONFIG_DM9000_DEBUGLEVEL=4 \
+    CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL=y
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ethernet/davicom/dm9000.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/dm9000.ko
+  endif
+  AUTOLOAD:=$(call AutoLoad,34,dm9000)
+endef
+
+define KernelPackage/dm9000/description
+ Kernel driver for Davicom 9000 Ethernet adapters.
+endef
+
+$(eval $(call KernelPackage,dm9000))