Move a bunch of ethernet hardware drivers to new kernel module packageing

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4569 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/include/modules-2.4.mk b/include/modules-2.4.mk
index 8e7d230..b00b61c 100644 (file)
--- a/include/modules-2.4.mk
+++ b/include/modules-2.4.mk
@@ -130,10 +130,6 @@ $(eval $(call KMOD_template,NET_HERMES_PCI,net-hermes-plx,\
        $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_plx.o \
 ,CONFIG_PLX_HERMES,kmod-net-hermes,11,orinoco_plx))
 
        $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_plx.o \
 ,CONFIG_PLX_HERMES,kmod-net-hermes,11,orinoco_plx))
 

-$(eval $(call KMOD_template,NET_NATSEMI,net-natsemi,\
-       $(MODULES_DIR)/kernel/drivers/net/natsemi.o \
-,CONFIG_NATSEMI,,10,natsemi))
-

 $(eval $(call KMOD_template,NET_PRISM54,net-prism54,\
        $(MODULES_DIR)/kernel/drivers/net/wireless/prism54/prism54.o \
 ,CONFIG_PRISM54,,10,prism54))
 $(eval $(call KMOD_template,NET_PRISM54,net-prism54,\
        $(MODULES_DIR)/kernel/drivers/net/wireless/prism54/prism54.o \
 ,CONFIG_PRISM54,,10,prism54))

diff --git a/include/modules-2.6.mk b/include/modules-2.6.mk
index 533a4c9..a0ff900 100644 (file)
--- a/include/modules-2.6.mk
+++ b/include/modules-2.6.mk
@@ -134,10 +134,6 @@ $(eval $(call KMOD_template,NET_3C59X,net-3c59x,\
        $(MODULES_DIR)/kernel/drivers/net/3c59x.ko \
 ,CONFIG_VORTEX,,10,3c59x))
 
        $(MODULES_DIR)/kernel/drivers/net/3c59x.ko \
 ,CONFIG_VORTEX,,10,3c59x))
 

-$(eval $(call KMOD_template,NET_8139TOO,net-8139too,\
-       $(MODULES_DIR)/kernel/drivers/net/8139too.ko \
-,CONFIG_8139TOO,,10,8139too))
-

 $(eval $(call KMOD_template,NET_AIRO,net-airo,\
        $(MODULES_DIR)/kernel/drivers/net/wireless/airo.ko \
 ,CONFIG_AIRO,,10,airo))
 $(eval $(call KMOD_template,NET_AIRO,net-airo,\
        $(MODULES_DIR)/kernel/drivers/net/wireless/airo.ko \
 ,CONFIG_AIRO,,10,airo))


@@ -159,10 +155,6 @@ $(eval $(call KMOD_template,NET_HERMES_PCI,net-hermes-plx,\
        $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_plx.ko \
 ,CONFIG_PLX_HERMES,kmod-net-hermes,11,orinoco_plx))
 
        $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_plx.ko \
 ,CONFIG_PLX_HERMES,kmod-net-hermes,11,orinoco_plx))
 

-$(eval $(call KMOD_template,NET_NATSEMI,net-natsemi,\
-       $(MODULES_DIR)/kernel/drivers/net/natsemi.ko \
-,CONFIG_NATSEMI,,10,natsemi))
-

 $(eval $(call KMOD_template,NET_PRISM54,net-prism54,\
        $(MODULES_DIR)/kernel/drivers/net/wireless/prism54/prism54.ko \
 ,CONFIG_PRISM54,,10,prism54))
 $(eval $(call KMOD_template,NET_PRISM54,net-prism54,\
        $(MODULES_DIR)/kernel/drivers/net/wireless/prism54/prism54.ko \
 ,CONFIG_PRISM54,,10,prism54))

diff --git a/package/kernel/modules.mk b/package/kernel/modules.mk
index 2f8be0d..51b7d8a 100644 (file)
--- a/package/kernel/modules.mk
+++ b/package/kernel/modules.mk
@@ -334,3 +334,78 @@ endef
 $(eval $(call KernelPackage,mppe))
 
 
 $(eval $(call KernelPackage,mppe))
 
 

+
+NDMENU:=Network Devices
+
+
+define KernelPackage/natsemi
+TITLE:=National Semiconductor DP8381x series 
+DESCRIPTION:=National Semiconductor DP8381x series PCI Ethernet kernel support
+SUBMENU:=$(NDMENU)
+FILES:=$(MODULES_DIR)/kernel/drivers/net/natsemi.$(LINUX_KMOD_SUFFIX)
+KCONFIG:=$(CONFIG_NATSEMI)
+DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
+endef
+$(eval $(call KernelPackage,natsemi))
+
+define KernelPackage/sis900
+TITLE:=SiS 900 Ethernet support
+DESCRIPTION:=Sis 900 kernel ethernet support
+SUBMENU:=$(NDMENU)
+FILES:=$(MODULES_DIR)/kernel/drivers/net/sis900.$(LINUX_KMOD_SUFFIX)
+KCONFIG:=$(CONFIG_SIS900)
+DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
+endef
+$(eval $(call KernelPackage,sis900))
+
+
+define KernelPackage/via-rhine
+TITLE:=Via Rhine ethernet support
+DESCRIPTION:=Kernel modules for Via Rhine ethernet chipsets
+SUBMENU:=$(NDMENU)
+FILES:=$(MODULES_DIR)/kernel/drivers/net/via-rhine.$(LINUX_KMOD_SUFFIX)
+KCONFIG:=$(CONFIG_VIA_RHINE)
+DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
+endef
+$(eval $(call KernelPackage,via-rhine))
+
+define KernelPackage/8139too
+TITLE:=RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support
+DESCRIPTION:=Kernel modules for RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support
+SUBMENU:=$(NDMENU)
+FILES:=$(MODULES_DIR)/kernel/drivers/net/8139too.$(LINUX_KMOD_SUFFIX)
+KCONFIG:=$(CONFIG_8139TOO)
+DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
+endef
+$(eval $(call KernelPackage,8139too))
+
+define KernelPackage/e100
+TITLE:=Intel(R) PRO/100+ cards kernel support
+DESCRIPTION:=Kernel modules for Intel(R) PRO/100+ cards kernel support
+SUBMENU:=$(NDMENU)
+FILES:=$(MODULES_DIR)/kernel/drivers/net/e100.$(LINUX_KMOD_SUFFIX)
+KCONFIG:=$(CONFIG_E100)
+DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
+endef
+$(eval $(call KernelPackage,e100))
+
+define KernelPackage/3c59x
+TITLE:=3Com 3c590/3c900 series (592/595/597) Vortex/Boomerang
+DESCRIPTION:= \
+         This option enables driver support for a large number of 10mbps and \
+         10/100mbps EISA, PCI and PCMCIA 3Com network cards: \
+         \
+          * "Vortex"    (Fast EtherLink 3c590/3c592/3c595/3c597) EISA and PCI \
+          * "Boomerang" (EtherLink XL 3c900 or 3c905)            PCI   \
+          * "Cyclone"   (3c540/3c900/3c905/3c980/3c575/3c656)    PCI and Cardbus \
+          * "Tornado"   (3c905)                                  PCI \
+          * "Hurricane" (3c555/3cSOHO)                           PCI 
+SUBMENU:=$(NDMENU)
+FILES:=$(MODULES_DIR)/kernel/drivers/net/3c59x.$(LINUX_KMOD_SUFFIX)
+KCONFIG:=$(CONFIG_3C59X)
+DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
+endef
+$(eval $(call KernelPackage,3c59x))
+
+
+

diff --git a/target/linux/Config.in b/target/linux/Config.in
index 9929b9e..7589ea7 100644 (file)
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -239,29 +239,6 @@ endmenu
 menu "Network devices support"
        depends LINUX_2_4_X86 || LINUX_2_6_X86
 
 menu "Network devices support"
        depends LINUX_2_4_X86 || LINUX_2_6_X86
 

-config PACKAGE_KMOD_NET_3C59X
-       prompt "kmod-net-3c59x.................... 3Com 3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" Ethernet kernel support"
-       tristate
-       depends LINUX_2_4_X86 || LINUX_2_6_X86
-       default m
-       help
-         This option enables driver support for a large number of 10mbps and 
-         10/100mbps EISA, PCI and PCMCIA 3Com network cards:
-         
-          * "Vortex"    (Fast EtherLink 3c590/3c592/3c595/3c597) EISA and PCI
-          * "Boomerang" (EtherLink XL 3c900 or 3c905)            PCI
-          * "Cyclone"   (3c540/3c900/3c905/3c980/3c575/3c656)    PCI and Cardbus
-          * "Tornado"   (3c905)                                  PCI
-          * "Hurricane" (3c555/3cSOHO)                           PCI
-
-config PACKAGE_KMOD_NET_8139TOO
-       prompt "kmod-net-8139too.................. RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support"
-       tristate
-       depends LINUX_2_4_X86 || LINUX_2_6_X86
-       default m
-       help
-         This is a driver for the Fast Ethernet PCI network cards based on 
-         the RTL8139 chips.

 
 config PACKAGE_KMOD_NET_AIRO
        prompt "kmod-net-airo..................... Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards kernel support"
 
 config PACKAGE_KMOD_NET_AIRO
        prompt "kmod-net-airo..................... Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards kernel support"


@@ -279,13 +256,6 @@ config PACKAGE_KMOD_NET_AIRO
          and Cisco proprietary API, so both the Linux Wireless Tools and the 
          Cisco Linux utilities can be used to configure the card.
 
          and Cisco proprietary API, so both the Linux Wireless Tools and the 
          Cisco Linux utilities can be used to configure the card.
 

-config PACKAGE_KMOD_NET_E100
-       prompt "kmod-net-e100..................... Intel(R) PRO/100+ cards kernel support"
-       tristate
-       depends LINUX_2_4_X86 || LINUX_2_6_X86
-       default m
-       help
-         Intel(R) PRO/100+ cards kernel support

 
 config PACKAGE_KMOD_NET_HERMES
        prompt "kmod-net-hermes................... Hermes chipset 802.11b support (Orinoco/Prism2/Symbol) kernel support"
 
 config PACKAGE_KMOD_NET_HERMES
        prompt "kmod-net-hermes................... Hermes chipset 802.11b support (Orinoco/Prism2/Symbol) kernel support"


@@ -328,15 +298,7 @@ config PACKAGE_KMOD_NET_HERMES_PLX
          802.11b PCMCIA cards can be used in desktop machines.  The Netgear 
          MA301 is such an adaptor.
 
          802.11b PCMCIA cards can be used in desktop machines.  The Netgear 
          MA301 is such an adaptor.
 

-config PACKAGE_KMOD_NET_NATSEMI
-       prompt "kmod-net-natsemi.................. National Semiconductor DP8381x series PCI Ethernet kernel support"
-       tristate
-       depends LINUX_2_4_X86 || LINUX_2_6_X86
-       default m
-       help
-         This driver is for the National Semiconductor DP83810 series, 
-         which is used in cards from PureData, NetGear, Linksys 
-         and others, including the 83815 chip.
+

 
 config PACKAGE_KMOD_NET_PRISM54
        prompt "kmod-net-prism54.................. Intersil Prism GT/Duette/Indigo PCI/PCMCIA cards kernel support"
 
 config PACKAGE_KMOD_NET_PRISM54
        prompt "kmod-net-prism54.................. Intersil Prism GT/Duette/Indigo PCI/PCMCIA cards kernel support"


@@ -384,7 +346,7 @@ menu "PCMCIA/CardBus support"
 
 config PACKAGE_KMOD_PCMCIA_CORE
        prompt "kmod-pcmcia-core.................. PCMCIA/CardBus support"
 
 config PACKAGE_KMOD_PCMCIA_CORE
        prompt "kmod-pcmcia-core.................. PCMCIA/CardBus support"

-       depends LINUX_PCMCIA_SUPPORT
+       depends PCMCIA_SUPPORT

        tristate
        depends LINUX_2_4_X86 || LINUX_2_6_X86 || LINUX_2_4_BRCM || LINUX_2_6_BRCM
        default m
        tristate
        depends LINUX_2_4_X86 || LINUX_2_6_X86 || LINUX_2_4_BRCM || LINUX_2_6_BRCM
        default m

diff --git a/target/linux/control/kmod-net-3c59x.control b/target/linux/control/kmod-net-3c59x.control
deleted file mode 100644 (file)
index 8d2b880..0000000
--- a/target/linux/control/kmod-net-3c59x.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: kmod-net-3c59x
-Priority: optional
-Section: sys
-Description: 3Com 3c590/3c900 series (592/595/597) "Vortex/Boomerang" cards kernel support

diff --git a/target/linux/control/kmod-net-8139too.control b/target/linux/control/kmod-net-8139too.control
deleted file mode 100644 (file)
index a3ad9af..0000000
--- a/target/linux/control/kmod-net-8139too.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: kmod-net-8139too
-Priority: optional
-Section: sys
-Description: RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support

diff --git a/target/linux/control/kmod-net-e100.control b/target/linux/control/kmod-net-e100.control
deleted file mode 100644 (file)
index bd5537b..0000000
--- a/target/linux/control/kmod-net-e100.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: kmod-net-e100
-Priority: optional
-Section: sys
-Description: Intel(R) PRO/100+ cards kernel support

diff --git a/target/linux/control/kmod-net-natsemi.control b/target/linux/control/kmod-net-natsemi.control
deleted file mode 100644 (file)
index 740ade6..0000000
--- a/target/linux/control/kmod-net-natsemi.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: kmod-net-natsemi
-Priority: optional
-Section: sys
-Description: National Semiconductor DP8381x series PCI Ethernet kernel support