ar71xx: Remove ath10k packages from archer-c7-v1 (fixes FS#1743)

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

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index e8f1b8ff34887a8c393d760891250eff76b9b201..685e89be96daa770c34ea01e0c71b9da3bc8224c 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,29 +2,24 @@
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS
-       default BINUTILS_VERSION_2_20_1 if avr32
-       default BINUTILS_VERSION_2_22 if !avr32
+       default BINUTILS_USE_VERSION_2_31_1 if !arc
+       default BINUTILS_USE_VERSION_2_32 if arc
        help
          Select the version of binutils you wish to use.
 
-       config BINUTILS_VERSION_2_19_1
-               bool "binutils 2.19.1"
+       config BINUTILS_USE_VERSION_2_29_1
+               depends on !arc
+               bool "Binutils 2.29.1"
+               select BINUTILS_VERSION_2_29_1
 
-       config BINUTILS_VERSION_2_20_1
-               depends on avr32
-               bool "binutils 2.20.1"
+       config BINUTILS_USE_VERSION_2_31_1
+               depends on !arc
+               bool "Binutils 2.31.1"
+               select BINUTILS_VERSION_2_31_1
 
-       config BINUTILS_VERSION_2_21_1
-               depends on !avr32 || (avr32 && BROKEN)
-               bool "binutils 2.21.1"
-
-       config BINUTILS_VERSION_2_22
-               depends on !avr32 || (avr32 && BROKEN)
-               bool "binutils 2.22"
-
-       config BINUTILS_VERSION_2_23_1
-               depends on !avr32 || (avr32 && BROKEN)
-               bool "binutils 2.23.1"
+       config BINUTILS_USE_VERSION_2_32
+               bool "Binutils 2.32"
+               select BINUTILS_VERSION_2_32
 
 endchoice
 
@@ -34,14 +29,3 @@ config EXTRA_BINUTILS_CONFIG_OPTIONS
        default ""
        help
            Any additional binutils options you may want to include....
-
-config BINUTILS_VERSION
-       string
-       prompt "Binutils Version" if (TOOLCHAINOPTS && NULL)
-       default "2.19.1"          if BINUTILS_VERSION_2_19_1
-       default "2.20.1"          if BINUTILS_VERSION_2_20_1
-       default "2.21.1"          if BINUTILS_VERSION_2_21_1
-       default "2.22"            if BINUTILS_VERSION_2_22
-       default "2.23.1"          if BINUTILS_VERSION_2_23_1
-       default "2.20.1"          if avr32
-       default "2.22"