rename soekris port to x86

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

diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in
index 0f9a0a2..8a2799f 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
 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
        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)
        help
          Build firmware images for Broadcom based routers
          (e.g. Linksys WRT54G(S), Asus WL-500g, Motorola WR850G)


@@ -17,48 +14,30 @@ config BR2_LINUX_2_4_BRCM
          with TFTP client too. 
 
 config BR2_LINUX_2_4_AR7
          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
        default n
        depends BR2_mipsel

-       depends BR2_LINUX_2_4

        help
          Build firmware images for TI AR7 based routers (w.g. Linksys WAG54G v2)
 
        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"
+config BR2_LINUX_2_4_X86
+       bool "Support for x86 boards [2.4]"

        default n
        depends BR2_i386
        default n
        depends BR2_i386

-       depends BR2_LINUX_2_4

        help
        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
-
+         Build firmware images for x86 based boards
+         (e.g. Soekris net4521 and net4801, PC Engines WRAP...)
+        

 config BR2_LINUX_2_6_BRCM
 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
        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)
        help
          Build firmware images for Broadcom based routers
          (e.g. Netgear WGT634u)

-         
+       
+endchoice
+       

 comment "Kernel Modules"
 
 config BR2_PACKAGE_KMOD_SANGAM_ATM_A
 comment "Kernel Modules"
 
 config BR2_PACKAGE_KMOD_SANGAM_ATM_A


@@ -103,6 +82,7 @@ config BR2_PACKAGE_KMOD_BRCM_ET
 config BR2_PACKAGE_KMOD_B44
        tristate "Broadcom 44XX, 47XX ethernet driver"
        default m
 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)
 
        help
          Free driver for Broadcom Ethernet chipsets (without switch support)
 


@@ -130,6 +110,14 @@ config BR2_PACKAGE_KMOD_IPTABLES_V4
        help
          Kernel modules for IPv4 firewalling
 
        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
 config BR2_PACKAGE_KMOD_IPTABLES_V4_EXTRA
        tristate "Extra modules for iptables"
        default m


@@ -339,7 +327,6 @@ config BR2_PACKAGE_KMOD_PPPOATM
 
 config BR2_PACKAGE_KMOD_ATM
        tristate "ATM support"
 
 config BR2_PACKAGE_KMOD_ATM
        tristate "ATM support"

-       default m

        default y if BR2_LINUX_2_4_AR7
        help
          ATM support
        default y if BR2_LINUX_2_4_AR7
        help
          ATM support


@@ -403,7 +390,7 @@ config BR2_PACKAGE_KMOD_PWC
 config BR2_PACKAGE_KMOD_NATSEMI
        tristate "Soekris net4801 ethernet driver"
        default y
 config BR2_PACKAGE_KMOD_NATSEMI
        tristate "Soekris net4801 ethernet driver"
        default y

-       depends BR2_LINUX_2_4_SOEKRIS
+       depends BR2_LINUX_2_4_X86

        help
          Driver for the National Semiconductor DP8381x series PCI Ethernet 
          found on Soekris net4801 boards
        help
          Driver for the National Semiconductor DP8381x series PCI Ethernet 
          found on Soekris net4801 boards


@@ -411,7 +398,7 @@ config BR2_PACKAGE_KMOD_NATSEMI
 config BR2_PACKAGE_KMOD_WD1100
        tristate "Soekris net4801 watchdog"
        default y
 config BR2_PACKAGE_KMOD_WD1100
        tristate "Soekris net4801 watchdog"
        default y

-       depends BR2_LINUX_2_4_SOEKRIS
+       depends BR2_LINUX_2_4_X86

        help
          Driver for the NatSemi SC1x00 series Watchdog 
          found on Soekris net4801 boards
        help
          Driver for the NatSemi SC1x00 series Watchdog 
          found on Soekris net4801 boards