domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some kernel module cleanup

Browse Source 
SVN-Revision: 5178
This commit is contained in:
Felix Fietkau
2006-10-17 01:47:12 +00:00
parent 22a9a91bfe
commit 6cee90e993
5 changed files with 79 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/modules-2.4.mk
View File

@@ -6,13 +6,6 @@
# #
include $(INCLUDE_DIR)/netfilter.mk 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 # Block devices
$(eval $(call KMOD_template,LOOP,loop,\ $(eval $(call KMOD_template,LOOP,loop,\

8
include/modules-2.6.mk
View File

@@ -7,14 +7,6 @@
NF_2_6:=1 NF_2_6:=1
include $(INCLUDE_DIR)/netfilter.mk 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 # Block devices
$(eval $(call KMOD_template,LOOP,loop,\ $(eval $(call KMOD_template,LOOP,loop,\

105
package/kernel/modules.mk
View File

@@ -66,7 +66,7 @@ define KernelPackage/lp
KCONFIG:=$(CONFIG_PARPORT) KCONFIG:=$(CONFIG_PARPORT)
FILES:= \ FILES:= \
$(MODULES_DIR)/kernel/drivers/parport/parport.o \ $(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/lp.o \
$(MODULES_DIR)/kernel/drivers/char/ppdev.o $(MODULES_DIR)/kernel/drivers/char/ppdev.o
AUTOLOAD:=$(call AutoLoad,50, \ AUTOLOAD:=$(call AutoLoad,50, \
@@ -78,32 +78,7 @@ endef
$(eval $(call KernelPackage,lp)) $(eval $(call KernelPackage,lp))
define KernelPackage/ieee80211softmac WIMENU:=Wireless Drivers
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
define KernelPackage/bcm43xx define KernelPackage/bcm43xx
TITLE:=Broadcom BCM43xx driver TITLE:=Broadcom BCM43xx driver
@@ -324,15 +299,53 @@ define KernelPackage/ebtables
endef endef
$(eval $(call KernelPackage,ebtables)) $(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 define KernelPackage/ipip
TITLE:=IP in IP encapsulation support TITLE:=IP in IP encapsulation support
DESCRIPTION:=\ DESCRIPTION:=\
Kernel modules for IP in IP encapsulation Kernel modules for IP in IP encapsulation
FILES:=$(MODULES_DIR)/kernel/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX)
KCONFIG:=$(CONFIG_NET_IPIP) KCONFIG:=$(CONFIG_NET_IPIP)
SUBMENU:=$(NSMENU)
endef endef
$(eval $(call KernelPackage,ipip)) $(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 define KernelPackage/ipv6
TITLE:=IPv6 support TITLE:=IPv6 support
@@ -340,6 +353,7 @@ define KernelPackage/ipv6
Kernel modules for IPv6 support Kernel modules for IPv6 support
KCONFIG:=$(CONFIG_IPV6) KCONFIG:=$(CONFIG_IPV6)
FILES:=$(MODULES_DIR)/kernel/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX) FILES:=$(MODULES_DIR)/kernel/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX)
SUBMENU:=$(NSMENU)
endef endef
$(eval $(call KernelPackage,ipv6)) $(eval $(call KernelPackage,ipv6))
@@ -350,6 +364,7 @@ define KernelPackage/gre
Generic Routing Encapsulation support Generic Routing Encapsulation support
KCONFIG=$(CONFIG_NET_IPGRE) KCONFIG=$(CONFIG_NET_IPGRE)
FILES=$(MODULES_DIR)/kernel/net/ipv4/ip_gre.$(LINUX_KMOD_SUFFIX) FILES=$(MODULES_DIR)/kernel/net/ipv4/ip_gre.$(LINUX_KMOD_SUFFIX)
SUBMENU:=$(NSMENU)
endef endef
$(eval $(call KernelPackage,gre)) $(eval $(call KernelPackage,gre))
@@ -360,6 +375,8 @@ define KernelPackage/tun
Kernel support for the TUN/TAP tunneling device Kernel support for the TUN/TAP tunneling device
KCONFIG:=$(CONFIG_TUN) KCONFIG:=$(CONFIG_TUN)
FILES:=$(MODULES_DIR)/kernel/drivers/net/tun.$(LINUX_KMOD_SUFFIX) FILES:=$(MODULES_DIR)/kernel/drivers/net/tun.$(LINUX_KMOD_SUFFIX)
SUBMENU:=$(NSMENU)
AUTOLOAD:=$(call AutoLoad,30,tun)
endef endef
$(eval $(call KernelPackage,tun)) $(eval $(call KernelPackage,tun))
@@ -369,6 +386,7 @@ define KernelPackage/ppp
DESCRIPTION:=\ DESCRIPTION:=\
Kernel modules for PPP support Kernel modules for PPP support
KCONFIG:=$(CONFIG_PPP) KCONFIG:=$(CONFIG_PPP)
SUBMENU:=$(NSMENU)
endef endef
define KernelPackage/ppp/2.6 define KernelPackage/ppp/2.6
@@ -389,6 +407,7 @@ define KernelPackage/pppoe
DEPENDS:=kmod-ppp DEPENDS:=kmod-ppp
KCONFIG:=$(CONFIG_PPPOE) KCONFIG:=$(CONFIG_PPPOE)
FILES:=$(MODULES_DIR)/kernel/drivers/net/pppoe.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/drivers/net/pppox.$(LINUX_KMOD_SUFFIX) FILES:=$(MODULES_DIR)/kernel/drivers/net/pppoe.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/drivers/net/pppox.$(LINUX_KMOD_SUFFIX)
SUBMENU:=$(NSMENU)
endef endef
$(eval $(call KernelPackage,pppoe)) $(eval $(call KernelPackage,pppoe))
@@ -400,6 +419,7 @@ define KernelPackage/pppoa
DEPENDS:=kmod-ppp DEPENDS:=kmod-ppp
KCONFIG:=$(CONFIG_PPPOATM) KCONFIG:=$(CONFIG_PPPOATM)
FILES:=$(MODULES_DIR)/kernel/net/atm/pppoatm.$(LINUX_KMOD_SUFFIX) FILES:=$(MODULES_DIR)/kernel/net/atm/pppoatm.$(LINUX_KMOD_SUFFIX)
SUBMENU:=$(NSMENU)
endef endef
$(eval $(call KernelPackage,pppoa)) $(eval $(call KernelPackage,pppoa))
@@ -409,6 +429,7 @@ define KernelPackage/mppe
DESCRIPTION:=Kernel modules for Microsoft PPP compression/encryption DESCRIPTION:=Kernel modules for Microsoft PPP compression/encryption
DEPENDS:=kmod-ppp DEPENDS:=kmod-ppp
KCONFIG:=$(CONFIG_PPP_MPPE) KCONFIG:=$(CONFIG_PPP_MPPE)
SUBMENU:=$(NSMENU)
endef endef
define KernelPackage/mppe/2.4 define KernelPackage/mppe/2.4
@@ -426,10 +447,38 @@ define KernelPackage/sched
DESCRIPTION:=\ DESCRIPTION:=\
Kernel schedulers for IP traffic Kernel schedulers for IP traffic
FILES:=$(MODULES_DIR)/kernel/net/sched/*.$(LINUX_KMOD_SUFFIX) FILES:=$(MODULES_DIR)/kernel/net/sched/*.$(LINUX_KMOD_SUFFIX)
SUBMENU:=$(NSMENU)
endef endef
$(eval $(call KernelPackage,sched)) $(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 NDMENU:=Network Devices

71
target/linux/Config.in
View File

@@ -6,70 +6,8 @@ source "target/linux/*-2.[46]/Config.in"
comment "Kernel modules" 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" 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 config PACKAGE_KMOD_LOOP
prompt "kmod-loop......................... Loop mount support" prompt "kmod-loop......................... Loop mount support"
tristate tristate
@@ -478,15 +416,6 @@ config PACKAGE_KMOD_SOFTDOG
help help
Kernel modules for software watchdog driver 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
endmenu endmenu

4
target/linux/ar7-2.4/Config.in
View File

@@ -11,7 +11,7 @@ config PACKAGE_KMOD_SANGAM_ATM_A
tristate tristate
default m default m
depends LINUX_2_4_AR7 depends LINUX_2_4_AR7
select PACKAGE_KMOD_ATM select PACKAGE_kmod-atm
help help
ATM driver for the Sangam ADSL chip on AR7 ATM driver for the Sangam ADSL chip on AR7
Annex A version Annex A version
@@ -21,7 +21,7 @@ config PACKAGE_KMOD_SANGAM_ATM_B
tristate tristate
default y default y
depends LINUX_2_4_AR7 depends LINUX_2_4_AR7
select PACKAGE_KMOD_ATM select PACKAGE_kmod-atm
help help
ATM driver for the Sangam ADSL chip on AR7 ATM driver for the Sangam ADSL chip on AR7
Annex B version Annex B version