firewall: fix potential NULL pointer access

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

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index e8f1b8ff34887a8c393d760891250eff76b9b201..9ebf52ddde5d25373f9d05a113f7a402aba43a1a 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -7,17 +7,10 @@ choice
        help
          Select the version of binutils you wish to use.
 
-       config BINUTILS_VERSION_2_19_1
-               bool "binutils 2.19.1"
-
        config BINUTILS_VERSION_2_20_1
                depends on avr32
                bool "binutils 2.20.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"
@@ -26,6 +19,10 @@ choice
                depends on !avr32 || (avr32 && BROKEN)
                bool "binutils 2.23.1"
 
+       config BINUTILS_VERSION_LINARO
+               depends on !avr32 || (avr32 && BROKEN)
+               bool "Linaro binutils 2.24"
+
 endchoice
 
 config EXTRA_BINUTILS_CONFIG_OPTIONS
@@ -38,10 +35,9 @@ config EXTRA_BINUTILS_CONFIG_OPTIONS
 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 "linaro"          if BINUTILS_VERSION_LINARO
        default "2.20.1"          if avr32
        default "2.22"