[package] base-files, uci: properly revert list state on config_load

[openwrt.git] / toolchain / binutils / Config.in

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 138b01a..7b5127b 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -1,68 +1,48 @@
 # Choose binutils version.
 
-if CONFIG_DEVEL
-       comment "Binutils Options"
-endif
-
 choice
-       prompt "Binutils Version" if CONFIG_DEVEL
-       default BR2_BINUTILS_VERSION_2_14_90_0_8
+       prompt "Binutils Version" if TOOLCHAINOPTS
+       default BINUTILS_VERSION_2_19_1
        help
          Select the version of binutils you wish to use.
 
-       config BR2_BINUTILS_VERSION_2_14_90_0_8
-               bool "binutils 2.14.90.0.8"
-
-       config BR2_BINUTILS_VERSION_2_15
-               bool "binutils 2.15"
-
-       config BR2_BINUTILS_VERSION_2_15_90_0_1
-               bool "binutils 2.15.90.0.1"
-
-       config BR2_BINUTILS_VERSION_2_15_90_0_1_1
-               bool "binutils 2.15.90.0.1.1"
-
-       config BR2_BINUTILS_VERSION_2_15_90_0_2
-               bool "binutils 2.15.90.0.2"
-
-       config BR2_BINUTILS_VERSION_2_15_90_0_3
-               bool "binutils 2.15.90.0.3"
-
-       config BR2_BINUTILS_VERSION_2_15_91_0_1
-               bool "binutils 2.15.91.0.1"
+       config BINUTILS_VERSION_2_18
+               depends !ubicom32
+               bool "binutils 2.18"
 
-       config BR2_BINUTILS_VERSION_2_15_91_0_2
-               bool "binutils 2.15.91.0.2"
+       config BINUTILS_VERSION_2_19_1
+               bool "binutils 2.19.1"
 
-       config BR2_BINUTILS_VERSION_2_15_92_0_2
-               bool "binutils 2.15.92.0.2"
-
-       config BR2_BINUTILS_VERSION_2_15_94_0_1
-               bool "binutils 2.15.94.0.1"
-
-       config BR2_BINUTILS_VERSION_2_15_94_0_2
-               bool "binutils 2.15.94.0.2"
-
-       config BR2_BINUTILS_VERSION_2_15_94_0_2_2
-               bool "binutils 2.15.94.0.2.2"
-
-       config BR2_BINUTILS_VERSION_2_16_90_0_1
-               bool "binutils 2.16.90.0.1"
+       config BINUTILS_VERSION_2_20
+               depends !avr32
+               depends !ubicom32
+               bool "binutils 2.20"
+        config BINUTILS_VERSION_2_20_1
+                depends !avr32
+                depends !ubicom32
+                bool "binutils 2.20.1"
 
+       config BINUTILS_VERSION_CS
+               depends !avr32
+               depends !ubicom32
+               depends BROKEN
+               bool "binutils 2.19.1+20090205 with CodeSourcery enhancements"
 
 endchoice
 
-config BR2_BINUTILS_VERSION
+config EXTRA_BINUTILS_CONFIG_OPTIONS
+       string
+       prompt "Additional binutils configure options" if TOOLCHAINOPTS
+       default ""
+       help
+           Any additional binutils options you may want to include....
+
+config BINUTILS_VERSION
        string
-       default "2.14.90.0.8"     if BR2_BINUTILS_VERSION_2_14_90_0_8 || !CONFIG_DEVEL
-       default "2.15"            if BR2_BINUTILS_VERSION_2_15
-       default "2.15.90.0.1"     if BR2_BINUTILS_VERSION_2_15_90_0_1
-       default "2.15.90.0.0.1.1" if BR2_BINUTILS_VERSION_2_15_90_0_1_1
-       default "2.15.90.0.2"     if BR2_BINUTILS_VERSION_2_15_90_0_2
-       default "2.15.90.0.3"     if BR2_BINUTILS_VERSION_2_15_90_0_3
-       default "2.15.91.0.1"     if BR2_BINUTILS_VERSION_2_15_91_0_1
-       default "2.15.91.0.2"     if BR2_BINUTILS_VERSION_2_15_91_0_2
-       default "2.15.92.0.2"     if BR2_BINUTILS_VERSION_2_15_92_0_2
-       default "2.15.94.0.1"     if BR2_BINUTILS_VERSION_2_15_94_0_1
-       default "2.15.94.0.2"     if BR2_BINUTILS_VERSION_2_15_94_0_2
-       default "2.16.90.0.1"     if BR2_BINUTILS_VERSION_2_16_90_0_1
+       prompt "Binutils Version" if (TOOLCHAINOPTS && NULL)
+       default "2.18"            if BINUTILS_VERSION_2_18
+       default "2.19.1"          if BINUTILS_VERSION_2_19_1
+       default "2.20"            if BINUTILS_VERSION_2_20
+       default "2.20.1"          if BINUTILS_VERSION_2_20_1
+       default "2.19.1+cs"       if BINUTILS_VERSION_CS
+       default "2.19.1"