update OpenVPN to 2.0.6 (security update)

[openwrt.git] / openwrt / Config.in.devel

diff --git a/openwrt/Config.in.devel b/openwrt/Config.in.devel
index ad42316..8e382f6 100644 (file)
--- a/openwrt/Config.in.devel
+++ b/openwrt/Config.in.devel
@@ -1,6 +1,9 @@
 #
+config CONFIG_DEVEL
+       bool
+       default y
 
-mainmenu "OpenWRT Configuration"
+mainmenu "OpenWrt Configuration"
 
 config MODULES
        bool
@@ -10,56 +13,52 @@ config BR2_HAVE_DOT_CONFIG
        bool
        default y
 
-config CONFIG_DEVEL
-       bool
-       default y
+# Supported architectures
 
-choice
-       prompt "Target Architecture" if CONFIG_DEVEL
-       default BR2_mipsel
-       help
-         Stuff
+config BR2_i386
+       tristate
+       
+config BR2_mips
+       tristate
+
+config BR2_mipsel
+       tristate
+
+# Unsupported architectures
+
+if CONFIG_DEVEL
 
 config BR2_arm
-       bool "arm"
+       tristate
 
 config BR2_armeb
-       bool "armeb"
+       tristate
 
 config BR2_cris
-       bool "cris"
-
-config BR2_i386
-       bool "i386"
+       tristate
 
 config BR2_m68k
-       bool "m68k"
-
-config BR2_mipseb
-       bool "mipseb"
-
-config BR2_mipsel
-       bool "mipsel"
+       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
 
-endchoice
+endif
 
 config BR2_ARCH
        string
@@ -68,8 +67,8 @@ config BR2_ARCH
        default "cris"    if BR2_cris
        default "i386"    if BR2_i386
        default "m68k"    if BR2_m68k
-       default "mipseb"  if BR2_mipseb
-       default "mipsel"  if BR2_mipsel
+       default "mips"    if BR2_mips
+       default "mipsel"  if BR2_mipsel || !CONFIG_DEVEL
        default "powerpc" if BR2_powerpc
        default "sh3"     if BR2_sh3
        default "sh3eb"   if BR2_sh3eb
@@ -77,32 +76,23 @@ config BR2_ARCH
        default "sh4eb"   if BR2_sh4eb
        default "sparc"   if BR2_sparc
 
+source "target/Config.in"
 
 menu "Build options"
 
 config BR2_WGET
-       string "Wget command"
+       string 
+       prompt "Wget command"
        default "wget --passive-ftp -nd"
 
 config BR2_TAR_VERBOSITY
-       bool "Tar verbose"
+       bool 
+       prompt "Tar verbose"
        default n
 
-config BR2_STAGING_DIR
-       string "Toolchain and header file location?"
-       default "$(BASE_DIR)/staging_dir_$(ARCH)$(ARCH_FPU_SUFFIX)"
-       help
-           This is the location where the toolchain will be installed.
-           Since the toolchain will not work if it is moved from this
-           location, it is important for people wishing to package up
-           a uClibc toolchain that this be set to the location in which
-           the toolchain will be used.
-
-           Most people will leave this set to the default value of
-           "$(BASE_DIR)/staging_dir_$(ARCH)$(ARCH_FPU_SUFFIX)".
-
 config BR2_JLEVEL
-       int "Number of jobs to run simultaneously"
+       int
+       prompt "Number of jobs to run simultaneously"
        default "1"
        help
            Number of jobs to run simultanesouly
@@ -111,4 +101,4 @@ endmenu
 
 source "toolchain/Config.in.devel"
 source "package/Config.in"
-source "target/Config.in"
+source "target/linux/Config.in"