make target selection nicer, choose arch automatically

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2947 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/Config.in b/Config.in
index 15130b1..99f9c9c 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -10,58 +10,52 @@ config BR2_HAVE_DOT_CONFIG
        bool
        default y
 
-choice
-       prompt "Target Architecture"
-       default BR2_mipsel
-
 # Supported architectures
 
 config BR2_i386
-       bool "i386"
+       tristate
        
 config BR2_mips
-       bool "mips"
+       tristate
 
 config BR2_mipsel
-       bool "mipsel"
+       tristate
 
+# Unsupported architectures
 
 if CONFIG_DEVEL
 
-# Unsupported architectures
-
 config BR2_arm
-       bool "arm"
+       tristate
 
 config BR2_armeb
-       bool "armeb"
+       tristate
 
 config BR2_cris
-       bool "cris"
+       tristate
 
 config BR2_m68k
-       bool "m68k"
+       tristate
 
 config BR2_powerpc
-       bool "powerpc"
+       tristate
 
 config BR2_sh3
-       bool "sh3"
+       tristate
 
 config BR2_sh3eb
-       bool "sh3eb"
+       tristate
 
 config BR2_sh4
-       bool "sh4"
+       tristate
 
 config BR2_sh4eb
-       bool "sh4eb"
+       tristate
 
 config BR2_sparc
-       bool "sparc"
+       tristate
 
 endif
-endchoice
 
 config BR2_ARCH
        string

diff --git a/Config.in.devel b/Config.in.devel
index 019062c..f271f30 100644 (file)
--- a/Config.in.devel
+++ b/Config.in.devel
@@ -13,55 +13,50 @@ config BR2_HAVE_DOT_CONFIG
        bool
        default y
 
-choice
-       prompt "Target Architecture"
-       default BR2_mipsel
-
 # Supported architectures
 
 config BR2_i386
-       bool "i386"
+       tristate
        
 config BR2_mips
-       bool "mips"
+       tristate
 
 config BR2_mipsel
-       bool "mipsel"
+       tristate
 
+# Unsupported architectures
 
 if CONFIG_DEVEL
 
-# Unsupported architectures
-
 config BR2_arm
-       bool "arm"
+       tristate
 
 config BR2_armeb
-       bool "armeb"
+       tristate
 
 config BR2_cris
-       bool "cris"
+       tristate
 
 config BR2_m68k
-       bool "m68k"
+       tristate
 
 config BR2_powerpc
-       bool "powerpc"
+       tristate
 
 config BR2_sh3
-       bool "sh3"
+       tristate
 
 config BR2_sh3eb
-       bool "sh3eb"
+       tristate
 
 config BR2_sh4
-       bool "sh4"
+       tristate
 
 config BR2_sh4eb
-       bool "sh4eb"
+       tristate
 
 config BR2_sparc
-       bool "sparc"
+       tristate
 
 endif
 endchoice

diff --git a/target/Config.in b/target/Config.in
index b506a50..03eabb7 100644 (file)
--- a/target/Config.in
+++ b/target/Config.in
@@ -1,22 +1,23 @@
 choice
        prompt "Target System"
+       default BR2_LINUX_2_4_BRCM
        
 config BR2_LINUX_2_4_AR531X
        bool "Atheros AR531x [2.4]"
-       depends BR2_mips
+       select BR2_mips
        help
          Build firmware images for Atheros AR531x based boards
          (e.g. Netgear WGT624, Linksys WRT55AG)
 
 config BR2_LINUX_2_6_ARUBA
        bool "Aruba [2.6]"
-       depends BR2_mips
+       select BR2_mips
        help
           Build firmware images for Aruba boards 
 
 config BR2_LINUX_2_4_BRCM
        bool "Broadcom BCM47xx/53xx [2.4]"
-       depends BR2_mipsel
+       select BR2_mipsel
        select BR2_LINUX_PCMCIA_SUPPORT
        help
          Build firmware images for Broadcom based routers
@@ -28,7 +29,7 @@ config BR2_LINUX_2_4_BRCM
 
 config BR2_LINUX_2_6_BRCM
        bool "Broadcom BCM47xx/53xx [2.6]"
-       depends BR2_mipsel
+       select BR2_mipsel
        select BR2_LINUX_PCMCIA_SUPPORT
        help
          Build firmware images for Broadcom based routers
@@ -36,13 +37,13 @@ config BR2_LINUX_2_6_BRCM
 
 config BR2_LINUX_2_4_AR7
        bool "TI AR7 [2.4]"
-       depends BR2_mipsel
+       select BR2_mipsel
        help
          Build firmware images for TI AR7 based routers (w.g. Linksys WAG54G v2)
 
 config BR2_LINUX_2_4_X86
        bool "x86 [2.4]"
-       depends BR2_i386
+       select BR2_i386
        select BR2_LINUX_PCMCIA_SUPPORT
        help
          Build firmware images for x86 based boards
@@ -50,7 +51,7 @@ config BR2_LINUX_2_4_X86
 
 config BR2_LINUX_2_6_X86
        bool "x86 [2.6]"
-       depends BR2_i386
+       select BR2_i386
        select BR2_LINUX_PCMCIA_SUPPORT
        help
          Build firmware images for x86 based boards