port olsrd update in [2837] from whiterussian to trunk

[openwrt.git] / openwrt / Config.in

diff --git a/openwrt/Config.in b/openwrt/Config.in
index 5867be0..308df37 100644 (file)
--- a/openwrt/Config.in
+++ b/openwrt/Config.in
@@ -10,11 +10,12 @@ config BR2_HAVE_DOT_CONFIG
        bool
        default y
 
+config BR2_mipsel
+       bool
+       default y
+
 choice
-       prompt "Target Architecture"
-       default BR2_mipsel
-       help
-         Stuff
+       prompt "Target Architecture" if CONFIG_DEVEL
 
 config BR2_arm
        bool "arm"
@@ -65,7 +66,7 @@ config BR2_ARCH
        default "i386"    if BR2_i386
        default "m68k"    if BR2_m68k
        default "mips"    if BR2_mips
-       default "mipsel"  if BR2_mipsel
+       default "mipsel"  if BR2_mipsel || !CONFIG_DEVEL
        default "powerpc" if BR2_powerpc
        default "sh3"     if BR2_sh3
        default "sh3eb"   if BR2_sh3eb
@@ -74,36 +75,17 @@ config BR2_ARCH
        default "sparc"   if BR2_sparc
 
 
-menu "Build options"
-
 config BR2_WGET
-       string "Wget command"
+       string 
        default "wget --passive-ftp -nd"
 
 config BR2_TAR_VERBOSITY
-       bool "Tar verbose"
+       bool 
        default n
 
-config BR2_STAGING_DIR
-       string "Toolchain and header file location?"
-       default "$(BUILD_DIR)/staging_dir"
-       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
-           "$(BUILD_DIR)/staging_dir".
-
 config BR2_JLEVEL
-       int "Number of jobs to run simultaneously"
+       int
        default "1"
-       help
-           Number of jobs to run simultanesouly
-
-endmenu
 
 source "toolchain/Config.in"
 source "package/Config.in"