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 3cb4a827f579341b967181de76760f90f2800427..685e89be96daa770c34ea01e0c71b9da3bc8224c 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,35 +2,30 @@
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS
-       default BINUTILS_VERSION_2_18 if TARGET_avr32
-       default BINUTILS_VERSION_2_17
+       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_17
-               bool "binutils 2.17"
+       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_18
-               bool "binutils 2.18"
+       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_19
-               depends !TARGET_avr32
-               bool "binutils 2.19"
+       config BINUTILS_USE_VERSION_2_32
+               bool "Binutils 2.32"
+               select BINUTILS_VERSION_2_32
 
 endchoice
 
 config EXTRA_BINUTILS_CONFIG_OPTIONS
        string
-       prompt "Additional binutils options" if TOOLCHAINOPTS
+       prompt "Additional binutils configure options" if TOOLCHAINOPTS
        default ""
        help
            Any additional binutils options you may want to include....
-
-config BINUTILS_VERSION
-       string
-       prompt "Binutils Version" if (TOOLCHAINOPTS && NULL)
-       default "2.17"            if BINUTILS_VERSION_2_17
-       default "2.18"            if BINUTILS_VERSION_2_18
-       default "2.19"            if BINUTILS_VERSION_2_19
-       default "2.18"            if TARGET_avr32
-       default "2.17"