X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=target%2Flinux%2FConfig.in;h=c4336eeceb0eac9565b05bd43aed6b3c51e91d5a;hb=7bd6eb6535f6fb81f5b7fb74086f0648b7d652ec;hp=aa1b8913ec7c46450ba95254597f593cfdc82b96;hpb=10b66bb635caee5c637d9ca0e155af1813293768;p=openwrt.git

diff --git a/target/linux/Config.in b/target/linux/Config.in
index aa1b8913ec..c4336eeceb 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -1,131 +1,41 @@
-choice
-	prompt "Target system"
-	
-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)
-	  
-	  This one builds the generic .trx images, activate one of the
-	  options below for creating device specific files for use 
-	  with TFTP client too. 
+menu "Target Root Filesystem"
 
-config BR2_LINUX_2_4_AR7
-	bool "Support for TI AR7 based devices [2.4]"
-	default n
-	depends BR2_mipsel
-	help
-	  Build firmware images for TI AR7 based routers (w.g. Linksys WAG54G v2)
+	config BR2_TARGET_ROOTFS_JFFS2
+		bool "jffs2"
+		default y
+		help
+		  Build a jffs2 root filesystem
 
-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...)
+	config BR2_TARGET_ROOTFS_SQUASHFS_LZMA
+		bool "squashfs-lzma"
+		default y
+		depends !BR2_LINUX_2_6_ARUBA
+		help
+		  Build a squashfs-lzma root filesystem
 
-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)
+	config BR2_TARGET_ROOTFS_TGZ
+		bool "tgz"
+		default y
+		help
+		  Build a compressed tar archive of the the root filesystem
 
-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
+endmenu
 
+menu "Kernel Configuration / Device Support"
 
-comment "Device specific modules"
+comment "Device specific configuration"
 
-config BR2_PACKAGE_KMOD_BRCM_ET
-	prompt "kmod-brcm-et...................... Broadcom Ethernet Driver"
-	tristate
-	depends BR2_LINUX_2_4_BRCM
-	default m
-	help
-	  Proprietary driver for Broadcom Ethernet chipsets (obsolete)
-
-config BR2_PACKAGE_KMOD_BRCM_WL
-	prompt "kmod-brcm-wl...................... Broadcom Wireless Network Driver"
-	tristate
-	depends BR2_LINUX_2_4_BRCM
-	default y
-	help
-	  Proprietary driver for Broadcom Wireless chipsets
-
-config BR2_PACKAGE_KMOD_BRCM_WL2
-	prompt "kmod-brcm-wl2..................... Broadcom Wireless Network Driver (new)"
-	tristate
-	depends BR2_LINUX_2_4_BRCM
-	default m
-	help
-	  Proprietary driver for Broadcom Wireless chipsets
-	  New version with Multi-BSS capability
-
-config BR2_PACKAGE_KMOD_CPMAC
-	prompt "kmod-cpmac........................ AR7 CPMAC Network Driver"
-	tristate
-	default y
-	depends BR2_LINUX_2_4_AR7
-	help
-	  Driver for the AR7 CPMAC network chip
-
-config BR2_PACKAGE_KMOD_SANGAM_ATM_A
-	prompt "kmod-sangam-atm-annex-a........... AR7 Sangam ADSL Driver (Annex A)"
-	tristate
-	default m
-	depends BR2_LINUX_2_4_AR7
-	select BR2_PACKAGE_KMOD_ATM
-	help
-	  ATM driver for the Sangam ADSL chip on AR7
-	  Annex A version
+source "target/linux/*-2.[46]/Config.in"
 
-config BR2_PACKAGE_KMOD_SANGAM_ATM_B
-	prompt "kmod-sangam-atm-annex-b........... AR7 Sangam ADSL Driver (Annex B)"
-	tristate
-	default y
-	depends BR2_LINUX_2_4_AR7
-	select BR2_PACKAGE_KMOD_ATM
-	help
-	  ATM driver for the Sangam ADSL chip on AR7
-	  Annex B version
+comment "Kernel modules"
 
-comment "Networking modules"
+menu "Networking modules"
 
 config BR2_PACKAGE_KMOD_ATM
 	prompt "kmod-atm.......................... ATM support"
 	tristate
 	default y if BR2_LINUX_2_4_AR7
+	default m
 	help
 	  ATM support
 
@@ -135,6 +45,13 @@ config BR2_PACKAGE_KMOD_GRE
 	default m
 	help
 	  Kernel support for GRE tunnels
+	
+config BR2_PACKAGE_KMOD_IMQ
+        prompt "kmod-imq.......................... Intermediate Queueing device"
+        tristate
+        default m
+        help
+          Kernel support for the Intermediate Queueing device
 
 config BR2_PACKAGE_KMOD_IPV6
 	prompt "kmod-ipv6......................... IPv6 support"
@@ -198,7 +115,9 @@ config BR2_PACKAGE_KMOD_TUN
 	help
 	  Kernel support for the TUN/TAP tunneling device
 
-comment "Filtering/Firewalling"
+endmenu
+
+menu "Filtering/Firewalling"
 
 config BR2_PACKAGE_KMOD_ARPTABLES
 	prompt "kmod-arptables.................... ARP firewalling support"
@@ -356,15 +275,24 @@ config BR2_PACKAGE_KMOD_IP6TABLES
 	help
 	  IPv6 firewalling support
 
-comment "Block devices support"
+endmenu
+
+menu "Block devices support"
 
 config BR2_PACKAGE_KMOD_IDE
 	prompt "kmod-ide.......................... IDE support"
 	tristate
 	default m
+	depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 || BR2_LINUX_2_4_BRCM || BR2_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
+	    - pdc202xx_old
 
 config BR2_PACKAGE_KMOD_LOOP
 	prompt "kmod-loop......................... Loop mount support"
@@ -380,19 +308,19 @@ config BR2_PACKAGE_KMOD_NBD
 	help
 	  Kernel module for network block device
 
-comment "Cryptographic support"
+endmenu
 
 config BR2_PACKAGE_KMOD_CRYPTO
-	prompt "kmod-crypto....................... CryptoAPI modules"
+	prompt "CryptoAPI modules"
 	tristate
 	default m
 	select BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE
 	help
 	  Kernel modules for cryptographic algorithms
 
-comment "Filesystems support"
+menu "Filesystems support"
 
-config BR2_PACKAGE_KMOD_CIFS
+config BR2_PACKAGE_KMOD_FS_CIFS
 	prompt "kmod-fs-cifs...................... CIFS support"
 	tristate
 	default m
@@ -443,11 +371,14 @@ config BR2_PACKAGE_KMOD_FS_XFS
 	help
 	  Kernel modules for XFS filesystem support
 
-comment "Multimedia devices support"
+endmenu
+
+menu "Multimedia devices support"
 
 config BR2_PACKAGE_KMOD_PWC
 	prompt "kmod-pwc.......................... Kernel driver for USB Philips Cameras"
 	tristate
+	depends BR2_PACKAGE_KMOD_USB
 	default m
 
 config BR2_PACKAGE_KMOD_SOUNDCORE
@@ -463,7 +394,9 @@ config BR2_PACKAGE_KMOD_VIDEODEV
 	tristate
 	default m
 
-comment "Native Language support"
+endmenu
+
+menu "Native Language support"
 
 config BR2_PACKAGE_KMOD_NLS_BASE
 	prompt "kmod-nls-base..................... Native Language support"
@@ -512,11 +445,15 @@ config BR2_PACKAGE_KMOD_NLS_UTF8
 	help
 	  Kernel native language support
 
-comment "Network devices support"
+endmenu
+
+menu "Network devices support"
+	depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86
 
 config BR2_PACKAGE_KMOD_NET_3C59X
 	prompt "kmod-net-3c59x.................... 3Com 3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" Ethernet kernel support"
 	tristate
+	depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86
 	default m
 	help
 	  This option enables driver support for a large number of 10mbps and 
@@ -531,6 +468,7 @@ config BR2_PACKAGE_KMOD_NET_3C59X
 config BR2_PACKAGE_KMOD_NET_8139TOO
 	prompt "kmod-net-8139too.................. RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support"
 	tristate
+	depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86
 	default m
 	help
 	  This is a driver for the Fast Ethernet PCI network cards based on 
@@ -539,6 +477,7 @@ config BR2_PACKAGE_KMOD_NET_8139TOO
 config BR2_PACKAGE_KMOD_NET_AIRO
 	prompt "kmod-net-airo..................... Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards kernel support"
 	tristate
+	depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86
 	default m
 	help
 	  This is the standard Linux driver to support Cisco/Aironet ISA and 
@@ -554,22 +493,15 @@ config BR2_PACKAGE_KMOD_NET_AIRO
 config BR2_PACKAGE_KMOD_NET_E100
 	prompt "kmod-net-e100..................... Intel(R) PRO/100+ cards kernel support"
 	tristate
+	depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86
 	default m
 	help
 	  Intel(R) PRO/100+ cards kernel support
 
-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
-	help
-	  Free driver for Broadcom Ethernet chipsets (without switch support)
-
 config BR2_PACKAGE_KMOD_NET_HERMES
 	prompt "kmod-net-hermes................... Hermes chipset 802.11b support (Orinoco/Prism2/Symbol) kernel support"
 	tristate
+	depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86
 	default m
 	help
 	  A driver for 802.11b wireless cards based based on the "Hermes" or 
@@ -610,6 +542,7 @@ config BR2_PACKAGE_KMOD_NET_HERMES_PLX
 config BR2_PACKAGE_KMOD_NET_NATSEMI
 	prompt "kmod-net-natsemi.................. National Semiconductor DP8381x series PCI Ethernet kernel support"
 	tristate
+	depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86
 	default m
 	help
 	  This driver is for the National Semiconductor DP83810 series, 
@@ -619,6 +552,7 @@ config BR2_PACKAGE_KMOD_NET_NATSEMI
 config BR2_PACKAGE_KMOD_NET_PRISM54
 	prompt "kmod-net-prism54.................. Intersil Prism GT/Duette/Indigo PCI/PCMCIA cards kernel support"
 	tristate
+	depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_BRCM
 	default m
 	help
 	  Enable PCI and Cardbus support for the following chipset based cards: 
@@ -654,12 +588,16 @@ config BR2_PACKAGE_KMOD_NET_PRISM54
 	  
 	  Note: You need a motherboard with DMA support to use any of these cards.
 
-comment "PCMCIA/CardBus support"
+endmenu
+
+menu "PCMCIA/CardBus support"
+	depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_BRCM
 
 config BR2_PACKAGE_KMOD_PCMCIA_CORE
 	prompt "kmod-pcmcia-core.................. PCMCIA/CardBus support"
 	depends BR2_LINUX_PCMCIA_SUPPORT
 	tristate
+	depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_BRCM
 	default m
 
 config BR2_PACKAGE_KMOD_PCMCIA_SERIAL
@@ -668,11 +606,14 @@ config BR2_PACKAGE_KMOD_PCMCIA_SERIAL
 	default m
 	depends BR2_PACKAGE_KMOD_PCMCIA_CORE
 
-comment "USB support"
+endmenu
+
+menu "USB support"
 
 config BR2_PACKAGE_KMOD_USB
 	prompt "kmod-usb-core..................... USB support"
 	tristate
+	default n if BR2_LINUX_2_4_AR531X
 	default m
 
 config BR2_PACKAGE_KMOD_USB_UHCI
@@ -750,13 +691,33 @@ 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
 
-comment "Misc. devices support"
+config BR2_PACKAGE_KMOD_USB_ATM
+        prompt "kmod-usb-atm...................... Support for USB ATM devices"
+	tristate
+	default m
+	depends BR2_PACKAGE_KMOD_USB_CONTROLLER
+
+config BR2_PACKAGE_KMOD_USB_ATM_SPEEDTOUCH
+        prompt   "kmod-usb-atm-speedtouch......... Support for USB Speedtouch ADSL modem"
+	tristate
+	default m
+	depends BR2_PACKAGE_KMOD_USB_ATM
+
+endmenu
+
+menu "Misc. devices support"
 
 config BR2_PACKAGE_KMOD_AX25
 	prompt "kmod-ax25......................... AX25 support"
@@ -771,6 +732,7 @@ config BR2_PACKAGE_KMOD_BLUETOOTH
 	prompt "kmod-bluetooth.................... Bluetooth drivers and network stack"
 	tristate
 	default m
+	default n if BR2_LINUX_2_4_AR531X
 	help
 	  Bluetooth drivers and network stack
 
@@ -782,7 +744,7 @@ config BR2_PACKAGE_KMOD_LP
 	  Kernel modules for line printer and parallel port support
 
 config BR2_PACKAGE_KMOD_SOFTDOG
-	prompt "kmod-softdog..................... software watchdog"
+	prompt "kmod-softdog...................... Software watchdog"
 	tristate
 	default m
 	help
@@ -797,6 +759,12 @@ config BR2_PACKAGE_KMOD_WD1100
 	  Driver for the NatSemi SC1x00 series Watchdog 
 	  found on Soekris net4801 boards
 
-comment "Additional kernel modules"
+endmenu
+
+menu "Additional kernel modules"
 
 source "target/linux/package/Config.in"
+
+endmenu
+
+endmenu