move firstboot to preinit for now (until a better solution is implemented), required...

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

diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in
index 7a7f7a4..9ccb11b 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
+       select BR2_LINUX_PCMCIA_SUPPORT
        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
+       select BR2_LINUX_PCMCIA_SUPPORT
        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
+       select BR2_LINUX_PCMCIA_SUPPORT
        help
          Build firmware images for Broadcom based routers
          (e.g. Netgear WGT634u)
@@ -40,21 +43,37 @@ 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)
+
 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
        depends BR2_LINUX_2_4_BRCM
-       default y
+       default m
        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"
@@ -158,6 +177,13 @@ config BR2_PACKAGE_KMOD_PPPOE
        help
          Support for PPP over Ethernet
 
+config BR2_PACKAGE_KMOD_RING
+       prompt "kmod-ring......................... PF Ring"
+       tristate
+       default m
+       help
+         PF Ring
+
 config BR2_PACKAGE_KMOD_SCHED
        prompt "kmod-sched........................ Traffic schedulers"
        tristate
@@ -535,10 +561,11 @@ config BR2_PACKAGE_KMOD_NET_E100
 config BR2_PACKAGE_KMOD_NET_B44
        prompt "kmod-net-b44...................... Broadcom 44XX, 47XX ethernet driver"
        tristate
-       default y if BR2_LINUX_2_6_BRCM
+       depends !BR2_LINUX_2_6_BRCM
+       default y if BR2_LINUX_2_4_BRCM
        default m
        help
-         Free driver for Broadcom Ethernet chipsets (without switch support)
+         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"
@@ -631,6 +658,7 @@ comment "PCMCIA/CardBus support"
 
 config BR2_PACKAGE_KMOD_PCMCIA_CORE
        prompt "kmod-pcmcia-core.................. PCMCIA/CardBus support"
+       depends BR2_LINUX_PCMCIA_SUPPORT
        tristate
        default m
 
@@ -753,6 +781,13 @@ config BR2_PACKAGE_KMOD_LP
        help
          Kernel modules for line printer and parallel port support
 
+config BR2_PACKAGE_KMOD_SOFTDOG
+       prompt "kmod-softdog..................... software watchdog"
+       tristate
+       default m
+       help
+         Kernel modules for software watchdog driver
+
 config BR2_PACKAGE_KMOD_WD1100
        prompt "kmod-wd1100....................... Soekris net4801 watchdog"
        tristate