update to new upstream release (v5.0.5),

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

diff --git a/target/linux/Config.in b/target/linux/Config.in
index d6a56ee..4eb2a6d 100644 (file)
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -6,6 +6,8 @@ config BR2_LINUX_2_4
 config BR2_LINUX_2_4_BRCM
        bool "Support for Broadcom based routers"
        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)
@@ -14,36 +16,68 @@ config BR2_LINUX_2_4_BRCM
          options below for creating device specific files for use 
          with TFTP client too. 
 
-       config BR2_TARGET_WRT54G
-               default y
-               depends BR2_LINUX_2_4_BRCM
-               bool "Linksys WRT54G"
-
-       config BR2_TARGET_WRT54GS
-               default y
-               depends BR2_LINUX_2_4_BRCM
-               bool "Linksys WRT54GS"
-       
-       config BR2_TARGET_MOTOROLA
-               default y
-               depends BR2_LINUX_2_4_BRCM
-               bool "Motorola WR850G"
-
 config BR2_LINUX_2_4_AR7
        bool "Support for TI AR7 based devices"
        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"
+       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"
+       default n
+       depends BR2_mipsel
+       depends BR2_LINUX_2_6
+       select BR2_PACKAGE_KMOD_B44
+       select BR2_PACKAGE_KMOD_MADWIFI
+       select BR2_PACKAGE_ROBOCFG
+       help
+         Build firmware images for Broadcom based routers
+         (e.g. Netgear WGT634u)
+         
 comment "Kernel Modules"
 
-config BR2_PACKAGE_KMOD_SANGAM_ATM
-       tristate "AR7 Sangam ADSL Driver"
+config BR2_PACKAGE_KMOD_SANGAM_ATM_A
+       tristate "AR7 Sangam ADSL Driver (Annex A)"
+       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
+       tristate "AR7 Sangam ADSL Driver (Annex B)"
        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
 
 config BR2_PACKAGE_KMOD_CPMAC
        tristate "AR7 CPMAC Network Driver"
@@ -84,6 +118,12 @@ config BR2_PACKAGE_KMOD_ARPT
        help
          Kernel modules for ARP firewalling
 
+config BR2_PACKAGE_KMOD_BLUETOOTH
+       tristate "Bluetooth drivers and network stack"
+       default m
+       help
+         Bluetooth drivers and network stack
+
 config BR2_PACKAGE_KMOD_EBT
        tristate "Ethernet Bridge firewalling support"
        default m
@@ -134,7 +174,7 @@ config BR2_PACKAGE_KMOD_USB
 
 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
@@ -152,8 +192,34 @@ 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
+       select BR2_PACKAGE_KMOD_USB_CONTROLLER
+
+config BR2_PACKAGE_KMOD_USB_SERIAL
+       tristate "kmod-usb-serial - Support for USB-to-serial converters"
+       default m
        depends BR2_PACKAGE_KMOD_USB_CONTROLLER
 
+config BR2_PACKAGE_KMOD_USB_SERIAL_BELKIN
+       tristate "kmod-usb-serial-belkin - Support for Belkin USB-to-serial converters"
+       default m
+       depends BR2_PACKAGE_KMOD_USB_SERIAL
+
+config BR2_PACKAGE_KMOD_USB_SERIAL_FTDI
+       tristate "kmod-usb-serial-ftdi - Support for FTDI USB-to-serial converterr"
+       default m
+       depends BR2_PACKAGE_KMOD_USB_SERIAL
+
+config BR2_PACKAGE_KMOD_USB_SERIAL_MCT_U232
+       tristate "kmod-usb-serial-mct-u232 - Support for Magic Control Technology USB-to-Serial converters"
+       default m
+       depends BR2_PACKAGE_KMOD_USB_SERIAL
+
+config BR2_PACKAGE_KMOD_USB_SERIAL_PL2303
+       tristate "kmod-usb-serial-pl2303 - Support for Prolific PL2303 USB-to-Serial converters"
+       default m
+       depends BR2_PACKAGE_KMOD_USB_SERIAL
+
 config BR2_PACKAGE_KMOD_USB_STORAGE
        tristate "Support for USB storage devices"
        default m
@@ -164,6 +230,11 @@ config BR2_PACKAGE_KMOD_USB_PRINTER
        default m
        depends BR2_PACKAGE_KMOD_USB_CONTROLLER
 
+config BR2_PACKAGE_KMOD_USB_AUDIO
+       tristate "Support for USB soundcards"
+       default m
+       depends BR2_PACKAGE_KMOD_USB_CONTROLLER
+
 config BR2_PACKAGE_KMOD_USB_ACM
        tristate "Support for USB modems/isdn controllers"
        default m
@@ -287,4 +358,28 @@ config BR2_PACKAGE_KMOD_SCHED
        help
          Kernel schedulers for IP traffic
 
+config BR2_PACKAGE_KMOD_VIDEODEV
+       tristate "Video (For Linux) kernel support"
+       default m
+
+config BR2_PACKAGE_KMOD_PWC
+       tristate "Kernel driver for USB Philips Cameras"
+       default m
+
+config BR2_PACKAGE_KMOD_NATSEMI
+       tristate "Soekris net4801 ethernet driver"
+       default y
+       depends BR2_LINUX_2_4_SOEKRIS
+       help
+         Driver for the National Semiconductor DP8381x series PCI Ethernet 
+         found on Soekris net4801 boards
+
+config BR2_PACKAGE_KMOD_WD1100
+       tristate "Soekris net4801 watchdog"
+       default y
+       depends BR2_LINUX_2_4_SOEKRIS
+       help
+         Driver for the NatSemi SC1x00 series Watchdog 
+         found on Soekris net4801 boards
+
 source "target/linux/package/Config.in"