X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=openwrt%2Ftarget%2Flinux%2FConfig.in;h=bb5afd30ca76fae6ad4b05c3dc3ab994c14e016a;hp=9ccb11bad945bd0246481a5f8dcab2f1c03e4e18;hb=9dc57adbb7b3744c0b29875815f58e5cf15b838e;hpb=08852b2cab1e1d80b7186e857534fae6ef51ef0a

diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in
index 9ccb11bad9..bb5afd30ca 100644
--- a/openwrt/target/linux/Config.in
+++ b/openwrt/target/linux/Config.in
@@ -1,124 +1,30 @@
-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
+		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_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)
+	config BR2_TARGET_ROOTFS_TGZ
+		bool "tgz"
+		default y
+		help
+		  Build a compressed tar archive of the the root filesystem
 
-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"
 
-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
-
-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
+source "target/linux/*-2.[46]/Config.in"
 
 comment "Networking modules"
 
@@ -126,6 +32,7 @@ config BR2_PACKAGE_KMOD_ATM
 	prompt "kmod-atm.......................... ATM support"
 	tristate
 	default y if BR2_LINUX_2_4_AR7
+	default m
 	help
 	  ATM support
 
@@ -362,6 +269,7 @@ 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)
@@ -448,6 +356,7 @@ comment "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
@@ -517,6 +426,7 @@ 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"
 	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 +441,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 +450,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 +466,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
-
 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 +515,8 @@ 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 || BR2_LINUX_2_6_ARUBA
+	default y if BR2_LINUX_2_6_ARUBA
 	default m
 	help
 	  This driver is for the National Semiconductor DP83810 series, 
@@ -619,6 +526,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: 
@@ -660,6 +568,7 @@ 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
@@ -673,6 +582,7 @@ comment "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,12 +660,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
@@ -771,6 +693,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
 
@@ -800,3 +723,5 @@ config BR2_PACKAGE_KMOD_WD1100
 comment "Additional kernel modules"
 
 source "target/linux/package/Config.in"
+
+endmenu