some kernel module cleanup

SVN-Revision: 5178

diff --git a/include/modules-2.4.mk b/include/modules-2.4.mk
index e8c67ac105433ec451e8bbe22864634e755a5acd..61ecbdb00b3e96604621b20c125b46941659acc1 100644 (file)
--- a/include/modules-2.4.mk
+++ b/include/modules-2.4.mk
@@ -6,13 +6,6 @@
 #
 include $(INCLUDE_DIR)/netfilter.mk
 
-# Networking
-
-$(eval $(call KMOD_template,ATM,atm,\
-       $(MODULES_DIR)/kernel/net/atm/atm.o \
-       $(MODULES_DIR)/kernel/net/atm/br2684.o \
-,CONFIG_ATM,,50,atm))
-
 # Block devices
 
 $(eval $(call KMOD_template,LOOP,loop,\

diff --git a/include/modules-2.6.mk b/include/modules-2.6.mk
index 9bb08261eadaca99ccdeee3880805754a408a4f6..8d67164c4649da20374eaef45443a80d85a09f12 100644 (file)
--- a/include/modules-2.6.mk
+++ b/include/modules-2.6.mk
@@ -7,14 +7,6 @@
 NF_2_6:=1
 include $(INCLUDE_DIR)/netfilter.mk
 
-# Networking
-
-$(eval $(call KMOD_template,ATM,atm,\
-       $(MODULES_DIR)/kernel/net/atm/atm.ko \
-       $(MODULES_DIR)/kernel/net/atm/br2684.ko \
-       $(MODULES_DIR)/kernel/drivers/atm/atmtcp.ko \
-,CONFIG_ATM,,50,atm))
-
 # Block devices
 
 $(eval $(call KMOD_template,LOOP,loop,\

diff --git a/package/kernel/modules.mk b/package/kernel/modules.mk
index c4b43d4c3e99493daaed2ecb961832f2799366e2..672ba0c3ca76f3ef2ba7302a79d20d1f0235d46f 100644 (file)
--- a/package/kernel/modules.mk
+++ b/package/kernel/modules.mk
@@ -66,7 +66,7 @@ define KernelPackage/lp
   KCONFIG:=$(CONFIG_PARPORT)
   FILES:= \
        $(MODULES_DIR)/kernel/drivers/parport/parport.o \
-       $(MODULES_DIR)/kernel/drivers/parport/parport_splink.o \
+       $(MODULES_DIR)/kernel/drivers/parport/parport_*.o \
        $(MODULES_DIR)/kernel/drivers/char/lp.o \
        $(MODULES_DIR)/kernel/drivers/char/ppdev.o
   AUTOLOAD:=$(call AutoLoad,50, \
@@ -78,32 +78,7 @@ endef
 $(eval $(call KernelPackage,lp))
 
 
-define KernelPackage/ieee80211softmac
-  TITLE:=802.11 Networking stack
-  DESCRIPTION:=\\\
-       \\\
-       Includes: \\\
-       - ieee80211_crypt \\\
-       - ieee80211 \\\
-       - ieee80211_crypt_wep \\\
-       - ieee80211_crypt_tkip \\\
-       - ieee80211_crytp_ccmp \\\
-       - ieee80211softmac
-  KCONFIG:=$(CONFIG_IEEE80211_SOFTMAC)
-  FILES:=$(MODULES_DIR)/kernel/net/ieee80211/*.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/net/ieee80211/softmac/*.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,10, \
-       ieee80211_crypt \
-       ieee80211 \
-       ieee80211_crypt_wep \
-       ieee80211_crypt_tkip \
-       ieee80211_crypt_ccmp \
-       ieee80211softmac \
-  )
-endef
-$(eval $(call KernelPackage,ieee80211softmac))
-
-
-WIMENU:=Wireless drivers
+WIMENU:=Wireless Drivers
 
 define KernelPackage/bcm43xx
   TITLE:=Broadcom BCM43xx driver
@@ -324,15 +299,53 @@ define KernelPackage/ebtables
 endef
 $(eval $(call KernelPackage,ebtables))
 
+NSMENU:=Network Support
+
+define KernelPackage/atm
+  TITLE:=ATM support
+  DEPENDS:=@ATM_SUPPORT
+  DESCRIPTION:= \
+    Kernel modules for ATM support
+  FILES:= \
+    $(MODULES_DIR)/kernel/net/atm/atm.o \
+    $(MODULES_DIR)/kernel/net/atm/br2684.o
+  KCONFIG:=$(CONFIG_ATM)
+  SUBMENU:=$(NSMENU)
+  AUTOLOAD:=$(call AutoLoad,30,atm)
+endef
+$(eval $(call KernelPackage,atm))
+
+define KernelPackage/atmtcp
+  TITLE:=ATM over TCP
+  DESCRIPTION:= \
+    Kernel module for ATM over TCP support
+  DEPENDS:=@LINUX_2_6 kmod-atm
+  FILES:=$(MODULES_DIR)/kernel/drivers/atm/atmtcp.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_ATM_TCP)
+  AUTOLOAD:=$(call AutoLoad,40,atmtcp)
+endef
+$(eval $(call KernelPackage,atmtcp))
+
 define KernelPackage/ipip
   TITLE:=IP in IP encapsulation support
   DESCRIPTION:=\
        Kernel modules for IP in IP encapsulation
-  FILES:=$(MODULES_DIR)/kernel/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=$(CONFIG_NET_IPIP)
+  SUBMENU:=$(NSMENU)
 endef
 $(eval $(call KernelPackage,ipip))
 
+define KernelPackage/ipip/2.4
+  FILES:=$(MODULES_DIR)/kernel/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,ipip)
+endef
+
+define KernelPackage/ipip/2.6
+  FILES:= \
+       $(MODULES_DIR)/kernel/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX) \
+       $(MODULES_DIR)/kernel/net/ipv4/tunnel4.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,ipip tunnel4)
+endef
 
 define KernelPackage/ipv6
   TITLE:=IPv6 support
@@ -340,6 +353,7 @@ define KernelPackage/ipv6
        Kernel modules for IPv6 support
   KCONFIG:=$(CONFIG_IPV6)
   FILES:=$(MODULES_DIR)/kernel/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX)
+  SUBMENU:=$(NSMENU)
 endef
 $(eval $(call KernelPackage,ipv6))
 
@@ -350,6 +364,7 @@ define KernelPackage/gre
        Generic Routing Encapsulation support
   KCONFIG=$(CONFIG_NET_IPGRE)
   FILES=$(MODULES_DIR)/kernel/net/ipv4/ip_gre.$(LINUX_KMOD_SUFFIX)
+  SUBMENU:=$(NSMENU)
 endef
 $(eval $(call KernelPackage,gre))
 
@@ -360,6 +375,8 @@ define KernelPackage/tun
        Kernel support for the TUN/TAP tunneling device
   KCONFIG:=$(CONFIG_TUN)
   FILES:=$(MODULES_DIR)/kernel/drivers/net/tun.$(LINUX_KMOD_SUFFIX)
+  SUBMENU:=$(NSMENU)
+  AUTOLOAD:=$(call AutoLoad,30,tun)
 endef
 $(eval $(call KernelPackage,tun))
 
@@ -369,6 +386,7 @@ define KernelPackage/ppp
   DESCRIPTION:=\
        Kernel modules for PPP support
   KCONFIG:=$(CONFIG_PPP)
+  SUBMENU:=$(NSMENU)
 endef
 
 define KernelPackage/ppp/2.6
@@ -389,6 +407,7 @@ define KernelPackage/pppoe
   DEPENDS:=kmod-ppp
   KCONFIG:=$(CONFIG_PPPOE)
   FILES:=$(MODULES_DIR)/kernel/drivers/net/pppoe.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/drivers/net/pppox.$(LINUX_KMOD_SUFFIX)
+  SUBMENU:=$(NSMENU)
 endef
 $(eval $(call KernelPackage,pppoe))
 
@@ -400,6 +419,7 @@ define KernelPackage/pppoa
   DEPENDS:=kmod-ppp
   KCONFIG:=$(CONFIG_PPPOATM)
   FILES:=$(MODULES_DIR)/kernel/net/atm/pppoatm.$(LINUX_KMOD_SUFFIX)
+  SUBMENU:=$(NSMENU)
 endef
 $(eval $(call KernelPackage,pppoa))
 
@@ -409,6 +429,7 @@ define KernelPackage/mppe
   DESCRIPTION:=Kernel modules for Microsoft PPP compression/encryption
   DEPENDS:=kmod-ppp
   KCONFIG:=$(CONFIG_PPP_MPPE)
+  SUBMENU:=$(NSMENU)
 endef
 
 define KernelPackage/mppe/2.4
@@ -426,10 +447,38 @@ define KernelPackage/sched
   DESCRIPTION:=\
        Kernel schedulers for IP traffic
   FILES:=$(MODULES_DIR)/kernel/net/sched/*.$(LINUX_KMOD_SUFFIX)
+  SUBMENU:=$(NSMENU)
 endef
 $(eval $(call KernelPackage,sched))
 
 
+define KernelPackage/ieee80211softmac
+  TITLE:=802.11 Networking stack
+  DESCRIPTION:=\\\
+       \\\
+       Includes: \\\
+       - ieee80211_crypt \\\
+       - ieee80211 \\\
+       - ieee80211_crypt_wep \\\
+       - ieee80211_crypt_tkip \\\
+       - ieee80211_crytp_ccmp \\\
+       - ieee80211softmac
+  DEPENDS:=@LINUX_2_6
+  KCONFIG:=$(CONFIG_IEEE80211_SOFTMAC)
+  FILES:=$(MODULES_DIR)/kernel/net/ieee80211/*.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/net/ieee80211/softmac/*.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,10, \
+       ieee80211_crypt \
+       ieee80211 \
+       ieee80211_crypt_wep \
+       ieee80211_crypt_tkip \
+       ieee80211_crypt_ccmp \
+       ieee80211softmac \
+  )
+  SUBMENU:=$(NSMENU)
+endef
+$(eval $(call KernelPackage,ieee80211softmac))
+
+
 
 NDMENU:=Network Devices
 

diff --git a/target/linux/Config.in b/target/linux/Config.in
index 20099fee429d485db8ecf8f57ade8b6527d0d5fb..46213d18b72761eb8bbd4fce4c21182fbaea8f5f 100644 (file)
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -6,70 +6,8 @@ source "target/linux/*-2.[46]/Config.in"
 
 comment "Kernel modules"
 
-menu "Networking modules"
-
-config PACKAGE_KMOD_ATM
-       prompt "kmod-atm.......................... ATM support"
-       tristate
-       default y if LINUX_2_4_AR7
-       default m
-       help
-         ATM support
-
-config PACKAGE_KMOD_IPIP
-       prompt "kmod-ipip......................... IP in IP encapsulation support"
-       tristate
-       default m
-       help
-         Kernel module for IP in IP encapsulation
-
-config PACKAGE_KMOD_RING
-       prompt "kmod-ring......................... PF Ring"
-       tristate
-       default m
-       help
-         PF Ring
-
-config PACKAGE_KMOD_TUN
-       prompt "kmod-tun.......................... Universal TUN/TAP driver"
-       tristate
-       default m
-       help
-         Kernel support for the TUN/TAP tunneling device
-
-endmenu
-
 menu "Block devices support"
 
-config PACKAGE_kmod-ide-core
-       prompt "kmod-ide-core..................... IDE support"
-       tristate
-       default m
-       depends LINUX_2_4_X86 || LINUX_2_6_X86 || LINUX_2_4_BRCM || LINUX_2_6_BRCM
-       help
-         Kernel modules for IDE support
-         useful for usb mass storage devices (e.g. on WL-HDD)
-         
-         Includes:
-           - ide-core
-           - ide-detect
-           - ide-disk
-
-config PACKAGE_kmod-ide-pdc202xx
-       prompt "kmod-ide-pdc202xx................. PDC202xx driver"
-       tristate
-       default m
-       depends PACKAGE_kmod-ide-core
-       depends LINUX_2_4_X86 || LINUX_2_6_X86 || LINUX_2_4_BRCM || LINUX_2_6_BRCM
-       help
-         Kernel modules for IDE support
-         useful for usb mass storage devices (e.g. on WL-HDD)
-         
-         Includes:
-           - ide-core
-           - ide-detect
-           - ide-disk
-
 config PACKAGE_KMOD_LOOP
        prompt "kmod-loop......................... Loop mount support"
        tristate
@@ -478,15 +416,6 @@ config PACKAGE_KMOD_SOFTDOG
        help
          Kernel modules for software watchdog driver
 
-config PACKAGE_KMOD_WD1100
-       prompt "kmod-wd1100....................... Soekris net4801 watchdog"
-       tristate
-       default y
-       depends LINUX_2_4_X86
-       help
-         Driver for the NatSemi SC1x00 series Watchdog 
-         found on Soekris net4801 boards
-
 endmenu
 
 endmenu

diff --git a/target/linux/ar7-2.4/Config.in b/target/linux/ar7-2.4/Config.in
index 57d06c01b5792e511b5a725685e99f8b2d505339..33eba57f4fb299aa4dd4c4053af2e96c69e529b4 100644 (file)
--- a/target/linux/ar7-2.4/Config.in
+++ b/target/linux/ar7-2.4/Config.in
@@ -11,7 +11,7 @@ config PACKAGE_KMOD_SANGAM_ATM_A
        tristate
        default m
        depends LINUX_2_4_AR7
-       select PACKAGE_KMOD_ATM
+       select PACKAGE_kmod-atm
        help
          ATM driver for the Sangam ADSL chip on AR7
          Annex A version
@@ -21,7 +21,7 @@ config PACKAGE_KMOD_SANGAM_ATM_B
        tristate
        default y
        depends LINUX_2_4_AR7
-       select PACKAGE_KMOD_ATM
+       select PACKAGE_kmod-atm
        help
          ATM driver for the Sangam ADSL chip on AR7
          Annex B version