use b44/switch driver on 2.4-brcm and 2.6-brcm

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

diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in
index 0c8d38a..9442c9f 100644 (file)
--- a/openwrt/target/linux/Config.in
+++ b/openwrt/target/linux/Config.in
@@ -5,6 +5,7 @@ config BR2_LINUX_2_4_BRCM
        bool "Support for Broadcom based routers [2.4]"
        default y
        depends BR2_mipsel
        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)
        help
          Build firmware images for Broadcom based routers
          (e.g. Linksys WRT54G(S), Asus WL-500g, Motorola WR850G)


@@ -24,6 +25,7 @@ config BR2_LINUX_2_4_X86
        bool "Support for x86 boards [2.4]"
        default n
        depends BR2_i386
        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...)
        help
          Build firmware images for x86 based boards
          (e.g. Soekris net4521 and net4801, PC Engines WRAP...)


@@ -32,6 +34,7 @@ config BR2_LINUX_2_6_BRCM
        bool "Support for Broadcom based routers [2.6]"
        default n
        depends BR2_mipsel
        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)
        help
          Build firmware images for Broadcom based routers
          (e.g. Netgear WGT634u)


@@ -40,21 +43,29 @@ config BR2_LINUX_2_6_X86
        bool "Support for x86 boards [2.6]"
        default n
        depends BR2_i386
        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...)
 
 endchoice
        help
          Build firmware images for x86 based boards
          (e.g. Soekris net4521 and net4801, PC Engines WRAP...)
 
 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
+
+

 comment "Device specific modules"
 
 config BR2_PACKAGE_KMOD_BRCM_ET
        prompt "kmod-brcm-et...................... Broadcom Ethernet Driver"
        tristate
 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 y
+       depends BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_BRCM
+       default m

        help
        help

-         Proprietary driver for Broadcom Ethernet chipsets
+         Proprietary driver for Broadcom Ethernet chipsets (obsolete)

 
 config BR2_PACKAGE_KMOD_BRCM_WL
        prompt "kmod-brcm-wl...................... Broadcom Wireless Network Driver"
 
 config BR2_PACKAGE_KMOD_BRCM_WL
        prompt "kmod-brcm-wl...................... Broadcom Wireless Network Driver"


@@ -489,7 +500,7 @@ config BR2_PACKAGE_KMOD_NLS_UTF8
 comment "Network devices support"
 
 config BR2_PACKAGE_KMOD_NET_3C59X
 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"
+       prompt "kmod-net-3c59x.................... 3Com 3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" Ethernet kernel support"

        tristate
        default m
        help
        tristate
        default m
        help


@@ -535,7 +546,7 @@ config BR2_PACKAGE_KMOD_NET_E100
 config BR2_PACKAGE_KMOD_NET_B44
        prompt "kmod-net-b44...................... Broadcom 44XX, 47XX ethernet driver"
        tristate
 config BR2_PACKAGE_KMOD_NET_B44
        prompt "kmod-net-b44...................... Broadcom 44XX, 47XX ethernet driver"
        tristate

-       default y if BR2_LINUX_2_6_BRCM
+       default y if BR2_LINUX_2_6_BRCM || BR2_LINUX_2_4_BRCM

        default m
        help
          Free driver for Broadcom Ethernet chipsets (without switch support)
        default m
        help
          Free driver for Broadcom Ethernet chipsets (without switch support)


@@ -631,6 +642,7 @@ comment "PCMCIA/CardBus support"
 
 config BR2_PACKAGE_KMOD_PCMCIA_CORE
        prompt "kmod-pcmcia-core.................. PCMCIA/CardBus support"
 
 config BR2_PACKAGE_KMOD_PCMCIA_CORE
        prompt "kmod-pcmcia-core.................. PCMCIA/CardBus support"

+       depends BR2_LINUX_PCMCIA_SUPPORT

        tristate
        default m
 
        tristate
        default m