add missing piece from whiterussian image building makefile to trunk/

[openwrt.git] / openwrt / target / linux / Config.in

diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in
index 22b2f8d..4c1b5ee 100644 (file)
--- a/openwrt/target/linux/Config.in
+++ b/openwrt/target/linux/Config.in
@@ -1,13 +1,10 @@
-
-config BR2_LINUX_2_4
-       bool "Linux 2.4"
-       default y
-
+choice
+       prompt "Target system"
+       
 config BR2_LINUX_2_4_BRCM
-       bool "Support for Broadcom based routers"
+       bool "Support for Broadcom based routers [2.4]"
        default y
        depends BR2_mipsel
-       depends BR2_LINUX_2_4
        help
          Build firmware images for Broadcom based routers
          (e.g. Linksys WRT54G(S), Asus WL-500g, Motorola WR850G)
@@ -17,46 +14,30 @@ config BR2_LINUX_2_4_BRCM
          with TFTP client too. 
 
 config BR2_LINUX_2_4_AR7
-       bool "Support for TI AR7 based devices"
+       bool "Support for TI AR7 based devices [2.4]"
        default n
        depends BR2_mipsel
-       depends BR2_LINUX_2_4
        help
          Build firmware images for TI AR7 based routers (w.g. Linksys WAG54G v2)
 
 config BR2_LINUX_2_4_SOEKRIS
-       bool "Support for Soekris boards"
+       bool "Support for Soekris boards [2.4]"
        default n
        depends BR2_i386
-       depends BR2_LINUX_2_4
        help
          Build firmware images for Soekris based boards
          (e.g. net4521, net4801)
-         
-       config BR2_TARGET_NET4521
-               default y
-               depends BR2_LINUX_2_4_SOEKRIS
-               bool "Soekris net4521"
-
-       config BR2_TARGET_NET4801
-               default y
-               depends BR2_LINUX_2_4_SOEKRIS
-               bool "Soekris net4801"
-
-config BR2_LINUX_2_6
-       bool "Linux 2.6"
-       default n
-
+        
 config BR2_LINUX_2_6_BRCM
-       bool "Support for Broadcom based routers"
+       bool "Support for Broadcom based routers [2.6]"
        default n
        depends BR2_mipsel
-       depends BR2_LINUX_2_6
-       select BR2_PACKAGE_KMOD_B44
        help
          Build firmware images for Broadcom based routers
          (e.g. Netgear WGT634u)
-         
+       
+endchoice
+       
 comment "Kernel Modules"
 
 config BR2_PACKAGE_KMOD_SANGAM_ATM_A
@@ -84,12 +65,6 @@ config BR2_PACKAGE_KMOD_CPMAC
        help
          Driver for the AR7 CPMAC network chip
 
-config BR2_PACKAGE_KMOD_DIAG
-       tristate "Router LED/Button Driver"
-       default y
-       help
-         Driver for the LEDs on Wireless Routers (diag)
-
 config BR2_PACKAGE_KMOD_BRCM_WL
        tristate "Broadcom Wireless Network Driver"
        depends BR2_LINUX_2_4_BRCM
@@ -107,6 +82,7 @@ config BR2_PACKAGE_KMOD_BRCM_ET
 config BR2_PACKAGE_KMOD_B44
        tristate "Broadcom 44XX, 47XX ethernet driver"
        default m
+       default y if BR2_LINUX_2_6_BRCM
        help
          Free driver for Broadcom Ethernet chipsets (without switch support)
 
@@ -134,6 +110,14 @@ config BR2_PACKAGE_KMOD_IPTABLES_V4
        help
          Kernel modules for IPv4 firewalling
 
+config BR2_PACKAGE_KMOD_AX25
+       tristate "AX25 support"
+       default m
+       help
+         Kernel modules for AX25 protocol family
+          - ax25.o: AX25 layer 2 support
+          - mkiss.o: AX25 KISS driver
+
 config BR2_PACKAGE_KMOD_IPTABLES_V4_EXTRA
        tristate "Extra modules for iptables"
        default m
@@ -166,13 +150,20 @@ config BR2_PACKAGE_KMOD_CIFS
        help
          Kernel modules for CIFS support
 
+config BR2_PACKAGE_KMOD_SOUNDCORE
+       tristate "Soundcard support"
+       default n
+       help
+         Base support for soundcards
+         Requires either USB soundcard support (OSS) or ALSA package to be useful
+
 config BR2_PACKAGE_KMOD_USB
        tristate "USB support"
        default m
 
 config BR2_PACKAGE_KMOD_USB_CONTROLLER
        tristate
-       depends on BR2_PACKAGE_KMOD_USB_UHCI || BR2_PACKAGE_KMOD_USB_OHCI
+       depends on BR2_PACKAGE_KMOD_USB_UHCI || BR2_PACKAGE_KMOD_USB_OHCI || BR2_PACKAGE_KMOD_USB2
        default n
 
 config BR2_PACKAGE_KMOD_USB_UHCI
@@ -190,7 +181,8 @@ config BR2_PACKAGE_KMOD_USB_OHCI
 config BR2_PACKAGE_KMOD_USB2
        tristate "Support for USB 2.0 controllers"
        default m
-       depends BR2_PACKAGE_KMOD_USB_CONTROLLER
+       depends BR2_PACKAGE_KMOD_USB
+       select BR2_PACKAGE_KMOD_USB_CONTROLLER
 
 config BR2_PACKAGE_KMOD_USB_SERIAL
        tristate "kmod-usb-serial - Support for USB-to-serial converters"
@@ -231,6 +223,7 @@ config BR2_PACKAGE_KMOD_USB_AUDIO
        tristate "Support for USB soundcards"
        default m
        depends BR2_PACKAGE_KMOD_USB_CONTROLLER
+       select BR2_PACKAGE_KMOD_SOUNDCORE
 
 config BR2_PACKAGE_KMOD_USB_ACM
        tristate "Support for USB modems/isdn controllers"
@@ -247,6 +240,8 @@ config BR2_PACKAGE_KMOD_IDE
 config BR2_PACKAGE_KMOD_VFAT
        tristate "VFAT filesystem support"
        default m
+       depends on BR2_PACKAGE_KMOD_NLS_BASE
+       depends on BR2_PACKAGE_KMOD_NLS_CP437 || BR2_PACKAGE_KMOD_NLS_CP850
        help
          Kernel modules for VFAT filesystem support
          useful for usb mass storage devices
@@ -332,7 +327,6 @@ config BR2_PACKAGE_KMOD_PPPOATM
 
 config BR2_PACKAGE_KMOD_ATM
        tristate "ATM support"
-       default m
        default y if BR2_LINUX_2_4_AR7
        help
          ATM support
@@ -355,6 +349,36 @@ config BR2_PACKAGE_KMOD_SCHED
        help
          Kernel schedulers for IP traffic
 
+config BR2_PACKAGE_KMOD_NLS_BASE
+       tristate "basic native language support for filesystems"
+       default m
+       help
+         Kernel native language support
+
+config BR2_PACKAGE_KMOD_NLS_CP437
+       tristate "code page 437"
+       default m
+       help
+         Kernel native language support
+
+config BR2_PACKAGE_KMOD_NLS_CP850
+       tristate "code page 850"
+       default m
+       help
+         Kernel native language support
+
+config BR2_PACKAGE_KMOD_NLS_UTF8
+       tristate "utf8"
+       default m
+       help
+         Kernel native language support
+
+config BR2_PACKAGE_KMOD_NLS_IS08859_1
+       tristate "iso8859-1"
+       default m
+       help
+         Kernel native language support
+
 config BR2_PACKAGE_KMOD_VIDEODEV
        tristate "Video (For Linux) kernel support"
        default m