X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/a3f7c3bcca3d6121df0ba386e43f651531f80ecd..1eeba399c689f74dcee49885546f0d657f73f64e:/toolchain/binutils/Config.in?ds=sidebyside diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in index 167ca64f8..fb81d13e8 100644 --- a/toolchain/binutils/Config.in +++ b/toolchain/binutils/Config.in @@ -2,30 +2,28 @@ choice prompt "Binutils Version" if TOOLCHAINOPTS - default BINUTILS_VERSION_2_18 if TARGET_avr32 - default BINUTILS_VERSION_2_18 if TARGET_ppc44x || TARGET_ppc40x - default BINUTILS_VERSION_2_19_1 + default BINUTILS_VERSION_2_19_1 if ubicom32 + default BINUTILS_VERSION_2_20_1 help Select the version of binutils you wish to use. - config BINUTILS_VERSION_2_17 - bool "binutils 2.17" + config BINUTILS_VERSION_2_19_1 + bool "binutils 2.19.1" - config BINUTILS_VERSION_2_18 - bool "binutils 2.18" + config BINUTILS_VERSION_2_20_1 + depends !ubicom32 + bool "binutils 2.20.1" - config BINUTILS_VERSION_2_19 - depends !TARGET_avr32 - bool "binutils 2.19" + config BINUTILS_VERSION_2_21 + depends !ubicom32 + depends !avr32 || (avr32 && BROKEN) + bool "binutils 2.21" - config BINUTILS_VERSION_2_19_1 - depends !TARGET_avr32 - bool "binutils 2.19.1" 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.... @@ -33,10 +31,8 @@ config EXTRA_BINUTILS_CONFIG_OPTIONS 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.19.1" if BINUTILS_VERSION_2_19_1 - default "2.18" if TARGET_avr32 - default "2.18" if TARGET_ppc44x || TARGET_ppc40x - default "2.19.1" + default "2.20.1" if BINUTILS_VERSION_2_20_1 + default "2.21" if BINUTILS_VERSION_2_21 + default "2.19.1" if ubicom32 + default "2.20.1"