sync with brcm

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

diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in
index 891f8f0..4eb2a6d 100644 (file)
--- a/openwrt/target/linux/Config.in
+++ b/openwrt/target/linux/Config.in
@@ -7,6 +7,7 @@ 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)
@@ -15,25 +16,11 @@ 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)
 
@@ -41,6 +28,7 @@ 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)
@@ -55,7 +43,22 @@ config BR2_LINUX_2_4_SOEKRIS
                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_A
@@ -171,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
@@ -189,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
@@ -201,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