toolchain: fix the sysroot mess by getting rid of $(TOOLCHAIN_DIR)/usr and moving...

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

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 544f62b..7b5127b 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,18 +2,26 @@
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS
-       default BINUTILS_VERSION_2_18 if avr32
        default BINUTILS_VERSION_2_19_1
        help
          Select the version of binutils you wish to use.
 
        config BINUTILS_VERSION_2_18
+               depends !ubicom32
                bool "binutils 2.18"
 
        config BINUTILS_VERSION_2_19_1
-               depends !avr32
                bool "binutils 2.19.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
@@ -34,6 +42,7 @@ config BINUTILS_VERSION
        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.18"            if avr32
        default "2.19.1"