X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/aa8d1f449ec0e838158da3b667597a8169691909..e2e1aff44f063dd354505f06e8e7f92dd966e194:/target/linux/Config.in

diff --git a/target/linux/Config.in b/target/linux/Config.in
index ba8e4113c..e56b2c82b 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -5,6 +5,7 @@ config BR2_LINUX_2_4_BRCM
 	bool "Support for Broadcom based routers [2.4]"
 	default y
 	depends BR2_mipsel
+	select BR2_LINUX_PCMCIA_SUPPORT
 	help
 	  Build firmware images for Broadcom based routers
 	  (e.g. Linksys WRT54G(S), Asus WL-500g, Motorola WR850G)
@@ -24,6 +25,7 @@ config BR2_LINUX_2_4_X86
 	bool "Support for x86 boards [2.4]"
 	default n
 	depends BR2_i386
+	select BR2_LINUX_PCMCIA_SUPPORT
 	help
 	  Build firmware images for x86 based boards
 	  (e.g. Soekris net4521 and net4801, PC Engines WRAP...)
@@ -32,6 +34,7 @@ config BR2_LINUX_2_6_BRCM
 	bool "Support for Broadcom based routers [2.6]"
 	default n
 	depends BR2_mipsel
+	select BR2_LINUX_PCMCIA_SUPPORT
 	help
 	  Build firmware images for Broadcom based routers
 	  (e.g. Netgear WGT634u)
@@ -40,21 +43,37 @@ config BR2_LINUX_2_6_X86
 	bool "Support for x86 boards [2.6]"
 	default n
 	depends BR2_i386
+	select BR2_LINUX_PCMCIA_SUPPORT
 	help
 	  Build firmware images for x86 based boards
 	  (e.g. Soekris net4521 and net4801, PC Engines WRAP...)
 
+config BR2_LINUX_2_4_AR531X
+	bool "Support for Atheros ar531x based APs"
+	default n
+	depends BR2_mips
+	help
+	  Build firmware images for Atheros ar531x based boards
+	  (e.g. Netgear WGT624, Linksys WRT55AG)
+
 endchoice
-	
+
+
+config BR2_LINUX_PCMCIA_SUPPORT
+	bool
+	default n
+	depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_X86 || BR2_LINUX_2_6_BRCM
+
+
 comment "Device specific modules"
 
 config BR2_PACKAGE_KMOD_BRCM_ET
 	prompt "kmod-brcm-et...................... Broadcom Ethernet Driver"
 	tristate
 	depends BR2_LINUX_2_4_BRCM
-	default y
+	default m
 	help
-	  Proprietary driver for Broadcom Ethernet chipsets
+	  Proprietary driver for Broadcom Ethernet chipsets (obsolete)
 
 config BR2_PACKAGE_KMOD_BRCM_WL
 	prompt "kmod-brcm-wl...................... Broadcom Wireless Network Driver"
@@ -107,6 +126,7 @@ config BR2_PACKAGE_KMOD_ATM
 	prompt "kmod-atm.......................... ATM support"
 	tristate
 	default y if BR2_LINUX_2_4_AR7
+	default m if BR2_LINUX_2_6_BRCM
 	help
 	  ATM support
 
@@ -144,6 +164,7 @@ config BR2_PACKAGE_KMOD_PPPOATM
 	prompt   "kmod-pppoatm.................... PPPoA (PPP over ATM) kernel support"
 	tristate
 	default y if BR2_LINUX_2_4_AR7
+	default m if BR2_LINUX_2_6_BRCM
 	default m
 	depends BR2_PACKAGE_KMOD_PPP
 	select BR2_PACKAGE_KMOD_ATM
@@ -158,6 +179,13 @@ config BR2_PACKAGE_KMOD_PPPOE
 	help
 	  Support for PPP over Ethernet
 
+config BR2_PACKAGE_KMOD_RING
+	prompt "kmod-ring......................... PF Ring"
+	tristate
+	default m
+	help
+	  PF Ring
+
 config BR2_PACKAGE_KMOD_SCHED
 	prompt "kmod-sched........................ Traffic schedulers"
 	tristate
@@ -188,21 +216,141 @@ config BR2_PACKAGE_KMOD_EBTABLES
 	help
 	  Kernel modules for bridge firewalling
 
-config BR2_PACKAGE_KMOD_IPTABLES_V4
-	prompt "kmod-iptables..................... Basic set of kernel modules for iptables"
+config BR2_PACKAGE_KMOD_IPTABLES
+	prompt "kmod-iptables..................... Core Netfilter modules for IPv4 firewalling"
 	tristate
 	default y
 	help
 	  Kernel modules for IPv4 firewalling
 
-config BR2_PACKAGE_KMOD_IPTABLES_V4_EXTRA
-	prompt "kmod-iptables-extra............... Extra modules for iptables"
+config BR2_PACKAGE_KMOD_IPTABLES_EXTRA
+	prompt "kmod-iptables-extra............... Extra Netfilter modules for IPv4 firewalling (meta-package)"
+	tristate
+	default m
+	select BR2_PACKAGE_KMOD_IPT_CONNTRACK
+	select BR2_PACKAGE_KMOD_IPT_FILTER
+	select BR2_PACKAGE_KMOD_IPT_IPOPT
+	select BR2_PACKAGE_KMOD_IPT_IPSEC
+	select BR2_PACKAGE_KMOD_IPT_NAT
+	select BR2_PACKAGE_KMOD_IPT_NAT_EXTRA
+	select BR2_PACKAGE_KMOD_IPT_QUEUE
+	select BR2_PACKAGE_KMOD_IPT_ULOG
+	select BR2_PACKAGE_KMOD_IPT_EXTRA
+	help
+	  Extra Netfilter kernel modules for IPv4 firewalling (meta-package)
+
+config BR2_PACKAGE_KMOD_IPT_CONNTRACK
+	prompt "kmod-ipt-conntrack................ Netfilter modules for connection tracking"
 	tristate
 	default m
 	help
-	  Extra kernel modules for IPv4 firewalling
+	  Netfilter (IPv4) kernel modules for connection tracking
 
-config BR2_PACKAGE_KMOD_IPTABLES_V6
+	  Includes:
+	    * ipt_conntrack
+	    * ipt_helper
+	    * ipt_connmark/CONNMARK
+
+config BR2_PACKAGE_KMOD_IPT_FILTER
+	prompt "kmod-ipt-filter................... Netfilter modules for packet content inspection"
+	tristate
+	default m
+	help
+	  Netfilter (IPv4) kernel modules for packet content inspection
+
+	  Includes:
+	    * ipt_ipp2p
+	    * ipt_layer7
+
+config BR2_PACKAGE_KMOD_IPT_IPOPT
+	prompt "kmod-ipt-ipopt.................... Netfilter modules for matching/changing IP packet options"
+	tristate
+	default m
+	help
+	  Netfilter (IPv4) kernel modules for matching/changing IP packet options
+	  
+	  Includes:
+	    * ipt_dscp/DSCP
+	    * ipt_ecn/ECN
+	    * ipt_length
+	    * ipt_mac
+	    * ipt_tos/TOS
+	    * ipt_tcpmms
+	    * ipt_ttl/TTL
+	    * ipt_unclean
+
+config BR2_PACKAGE_KMOD_IPT_IPSEC
+	prompt "kmod-ipt-ipsec.................... Netfilter modules for matching IPsec packets"
+	tristate
+	default m
+	help
+	  Netfilter (IPv4) kernel modules for matching IPsec packets
+	  
+	  Includes:
+	    * ipt_ah
+	    * ipt_esp
+
+config BR2_PACKAGE_KMOD_IPT_NAT
+	prompt "kmod-ipt-nat...................... Netfilter modules for different NAT targets"
+	tristate
+	default m
+	help
+	  Netfilter (IPv4) kernel modules for different NAT targets
+
+	  Includes: 
+	    * ipt_REDIRECT
+
+config BR2_PACKAGE_KMOD_IPT_NAT_EXTRA
+	prompt "kmod-ipt-nat-extra................ Extra Netfilter NAT modules for special protocols"
+	tristate
+	default m
+	help
+	  Extra Netfilter (IPv4) NAT kernel modules for special protocols
+	  
+	  Includes:
+	    * ip_conntrack_amanda
+	    * ip_conntrack_proto_gre
+	    * ip_nat_proto_gre
+	    * ip_conntrack_pptp
+	    * ip_nat_pptp
+	    * ip_nat_snmp_basic
+	    * ip_conntrack_tftp
+
+config BR2_PACKAGE_KMOD_IPT_QUEUE
+	prompt "kmod-ipt-queue.................... Netfilter module for user-space packet queueing"
+	tristate
+	default m
+	help
+	  Netfilter (IPv4) module for user-space packet queueing
+	  
+	  Includes:
+	    * ipt_QUEUE
+
+config BR2_PACKAGE_KMOD_IPT_ULOG
+	prompt "kmod-ipt-ulog..................... Netfilter module for user-space packet logging"
+	tristate
+	default m
+	help
+	  Netfilter (IPv4) module for user-space packet logging
+	  
+	  Includes:
+	    * ipt_ULOG
+
+config BR2_PACKAGE_KMOD_IPT_EXTRA
+	prompt "kmod-ipt-extra.................... Other extra Netfilter modules"
+	tristate
+	default m
+	help
+	  Other extra Netfilter (IPv4) kernel modules
+
+	  Includes:
+	    * ipt_limit
+	    * ipt_owner
+	    * ipt_physdev
+	    * ipt_pkttype
+	    * ipt_recent
+
+config BR2_PACKAGE_KMOD_IP6TABLES
 	prompt "kmod-ip6tables.................... Kernel modules for ip6tables"
 	tristate
 	default m
@@ -369,7 +517,7 @@ config BR2_PACKAGE_KMOD_NLS_UTF8
 comment "Network devices support"
 
 config BR2_PACKAGE_KMOD_NET_3C59X
-	prompt "kmod-net-3C59x.................... 3Com 3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" Ethernet kernel support"
+	prompt "kmod-net-3c59x.................... 3Com 3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" Ethernet kernel support"
 	tristate
 	default m
 	help
@@ -405,20 +553,21 @@ config BR2_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.
 
-config BR2_PACKAGE_KMOD_E100
+config BR2_PACKAGE_KMOD_NET_E100
 	prompt "kmod-net-e100..................... Intel(R) PRO/100+ cards kernel support"
 	tristate
 	default m
 	help
 	  Intel(R) PRO/100+ cards kernel support
 
-config BR2_PACKAGE_KMOD_B44
+config BR2_PACKAGE_KMOD_NET_B44
 	prompt "kmod-net-b44...................... Broadcom 44XX, 47XX ethernet driver"
 	tristate
+	depends !BR2_LINUX_2_6_BRCM
+	default y if BR2_LINUX_2_4_BRCM
 	default m
-	default y if BR2_LINUX_2_6_BRCM
 	help
-	  Free driver for Broadcom Ethernet chipsets (without switch support)
+	  Free driver for Broadcom Ethernet chipsets
 
 config BR2_PACKAGE_KMOD_NET_HERMES
 	prompt "kmod-net-hermes................... Hermes chipset 802.11b support (Orinoco/Prism2/Symbol) kernel support"
@@ -511,9 +660,16 @@ comment "PCMCIA/CardBus support"
 
 config BR2_PACKAGE_KMOD_PCMCIA_CORE
 	prompt "kmod-pcmcia-core.................. PCMCIA/CardBus support"
+	depends BR2_LINUX_PCMCIA_SUPPORT
 	tristate
 	default m
 
+config BR2_PACKAGE_KMOD_PCMCIA_SERIAL
+	prompt   "kmod-pcmcia-serial.............. PCMCIA/CardBus serial device support"
+	tristate
+	default m
+	depends BR2_PACKAGE_KMOD_PCMCIA_CORE
+
 comment "USB support"
 
 config BR2_PACKAGE_KMOD_USB
@@ -596,12 +752,24 @@ config BR2_PACKAGE_KMOD_USB_SERIAL_PL2303
 	default m
 	depends BR2_PACKAGE_KMOD_USB_SERIAL
 
+config BR2_PACKAGE_KMOD_USB_SERIAL_VISOR
+	prompt   "kmod-usb-serial-visor.......... Support for Handspring Visor / Palm m50x / Sony Clie Driver"
+	tristate
+	default m
+	depends BR2_PACKAGE_KMOD_USB_SERIAL
+
 config BR2_PACKAGE_KMOD_USB_STORAGE
 	prompt "kmod-usb-storage.................. Support for USB storage devices"
 	tristate
 	default m
 	depends BR2_PACKAGE_KMOD_USB_CONTROLLER
 
+config BR2_PACKAGE_KMOD_USB_ATM
+        prompt "kmod-usb-atm...................... Support for USB ATM devices"
+	tristate
+	default m
+	depends BR2_PACKAGE_KMOD_USB_CONTROLLER
+
 comment "Misc. devices support"
 
 config BR2_PACKAGE_KMOD_AX25
@@ -627,6 +795,13 @@ config BR2_PACKAGE_KMOD_LP
 	help
 	  Kernel modules for line printer and parallel port support
 
+config BR2_PACKAGE_KMOD_SOFTDOG
+	prompt "kmod-softdog..................... software watchdog"
+	tristate
+	default m
+	help
+	  Kernel modules for software watchdog driver
+
 config BR2_PACKAGE_KMOD_WD1100
 	prompt "kmod-wd1100....................... Soekris net4801 watchdog"
 	tristate