2
1
Peter Korsgaard 16 жил өмнө
parent
commit
96dbf8aad4

+ 9 - 1
toolchain/binutils/Config.in

@@ -4,7 +4,7 @@ comment "Binutils Options"
 
 
 choice
 choice
 	prompt "Binutils Version"
 	prompt "Binutils Version"
-	default BR2_BINUTILS_VERSION_2_19
+	default BR2_BINUTILS_VERSION_2_19_1
 	help
 	help
 	  Select the version of binutils you wish to use.
 	  Select the version of binutils you wish to use.
 
 
@@ -20,6 +20,7 @@ choice
 
 
 	config BR2_BINUTILS_VERSION_2_18
 	config BR2_BINUTILS_VERSION_2_18
 		depends on !BR2_nios2
 		depends on !BR2_nios2
+		depends on BR2_DEPRECATED
 		depends on BR2_EXT_BINUTILS_VERSION_2_18
 		depends on BR2_EXT_BINUTILS_VERSION_2_18
 		bool "binutils 2.18"
 		bool "binutils 2.18"
 
 
@@ -50,7 +51,13 @@ choice
 
 
 	config BR2_BINUTILS_VERSION_2_19
 	config BR2_BINUTILS_VERSION_2_19
 		depends on !BR2_avr32 && !BR2_nios2
 		depends on !BR2_avr32 && !BR2_nios2
+		depends on BR2_DEPRECATED || BR2_RECENT
 		bool "binutils 2.19"
 		bool "binutils 2.19"
+
+	config BR2_BINUTILS_VERSION_2_19_1
+		depends on !BR2_avr32 && !BR2_nios2
+		bool "binutils 2.19.1"
+
 endchoice
 endchoice
 
 
 config BR2_BINUTILS_VERSION
 config BR2_BINUTILS_VERSION
@@ -65,6 +72,7 @@ config BR2_BINUTILS_VERSION
 	default "2.18.50.0.8"	if BR2_BINUTILS_VERSION_2_18_50_0_8
 	default "2.18.50.0.8"	if BR2_BINUTILS_VERSION_2_18_50_0_8
 	default "2.18.50.0.9"	if BR2_BINUTILS_VERSION_2_18_50_0_9
 	default "2.18.50.0.9"	if BR2_BINUTILS_VERSION_2_18_50_0_9
 	default "2.19"		if BR2_BINUTILS_VERSION_2_19
 	default "2.19"		if BR2_BINUTILS_VERSION_2_19
+	default "2.19.1"	if BR2_BINUTILS_VERSION_2_19_1
 
 
 config BR2_EXTRA_BINUTILS_CONFIG_OPTIONS
 config BR2_EXTRA_BINUTILS_CONFIG_OPTIONS
 	string "Additional binutils options"
 	string "Additional binutils options"

+ 3 - 0
toolchain/binutils/binutils.mk

@@ -9,6 +9,9 @@ BINUTILS_VERSION:=$(subst ",,$(BR2_BINUTILS_VERSION))
 EXTRA_BINUTILS_CONFIG_OPTIONS=$(strip $(subst ",, $(BR2_EXTRA_BINUTILS_CONFIG_OPTIONS)))
 EXTRA_BINUTILS_CONFIG_OPTIONS=$(strip $(subst ",, $(BR2_EXTRA_BINUTILS_CONFIG_OPTIONS)))
 #"))
 #"))
 BINUTILS_SITE:=$(BR2_KERNEL_MIRROR)/linux/devel/binutils
 BINUTILS_SITE:=$(BR2_KERNEL_MIRROR)/linux/devel/binutils
+ifeq ($(BINUTILS_VERSION),2.19.1)
+BINUTILS_SITE:=$(BR2_GNU_MIRROR)/binutils/
+endif
 ifeq ($(BINUTILS_VERSION),2.19)
 ifeq ($(BINUTILS_VERSION),2.19)
 BINUTILS_SITE:=$(BR2_GNU_MIRROR)/binutils/
 BINUTILS_SITE:=$(BR2_GNU_MIRROR)/binutils/
 endif
 endif