summaryrefslogtreecommitdiff
path: root/toolchain/binutils
diff options
context:
space:
mode:
Diffstat (limited to 'toolchain/binutils')
-rw-r--r--toolchain/binutils/Config.in14
-rw-r--r--toolchain/binutils/binutils.mk15
-rw-r--r--toolchain/binutils/ext_source/Atmel/avr32/2.17-avr32-2.0/.empty0
-rw-r--r--toolchain/binutils/ext_source/Atmel/avr32/2.17-avr32-2.1.3/.empty0
-rw-r--r--toolchain/binutils/ext_source/Atmel/avr32/2.17-avr32-2.1.5/.empty0
-rw-r--r--toolchain/binutils/ext_source/Atmel/avr32/2.18-avr32-1.0.1/.empty0
6 files changed, 16 insertions, 13 deletions
diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index b892b6f74..b8ce332a1 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -9,14 +9,13 @@ choice
Select the version of binutils you wish to use.
config BR2_BINUTILS_VERSION_2_17
- depends on !BR2_nios2
- depends on BR2_DEPRECATED || (BR2_avr32 && BR2_EXT_BINUTILS_VERSION_2_17)
+ depends on !BR2_nios2 && !BR2_avr32
+ depends on BR2_DEPRECATED
bool "binutils 2.17"
config BR2_BINUTILS_VERSION_2_18
- depends on !BR2_nios2
- depends on BR2_DEPRECATED || BR2_avr32
- depends on BR2_EXT_BINUTILS_VERSION_2_18
+ depends on !BR2_nios2 && !BR2_avr32
+ depends on BR2_DEPRECATED
bool "binutils 2.18"
config BR2_BINUTILS_VERSION_2_18_50_0_9
@@ -24,6 +23,10 @@ choice
depends on BR2_DEPRECATED
bool "binutils 2.18.50.0.9"
+ config BR2_BINUTILS_VERSION_2_18_AVR32_1_0_1
+ depends on BR2_avr32
+ bool "binutils 2.18-avr32-1.0.1"
+
config BR2_BINUTILS_VERSION_2_19
depends on !BR2_avr32 && !BR2_nios2
depends on BR2_DEPRECATED
@@ -46,6 +49,7 @@ config BR2_BINUTILS_VERSION
default "2.17" if BR2_BINUTILS_VERSION_2_17
default "2.18" if BR2_BINUTILS_VERSION_2_18
default "2.18.50.0.9" if BR2_BINUTILS_VERSION_2_18_50_0_9
+ default "2.18-avr32-1.0.1" if BR2_BINUTILS_VERSION_2_18_AVR32_1_0_1
default "2.19" if BR2_BINUTILS_VERSION_2_19
default "2.19.1" if BR2_BINUTILS_VERSION_2_19_1
default "2.20" if BR2_BINUTILS_VERSION_2_20
diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk
index 8cddf2d50..288a000f5 100644
--- a/toolchain/binutils/binutils.mk
+++ b/toolchain/binutils/binutils.mk
@@ -22,6 +22,9 @@ endif
ifeq ($(BINUTILS_VERSION),2.17)
BINUTILS_SITE:=$(BR2_GNU_MIRROR)/binutils/
endif
+ifeq ($(findstring avr32,$(BINUTILS_VERSION)),avr32)
+BINUTILS_SITE:=ftp://www.at91.com/pub/buildroot/
+endif
# We do not rely on the host's gmp/mpfr but use a known working one
BINUTILS_HOST_PREREQ:=
@@ -45,21 +48,15 @@ BINUTILS_TARGET_CONFIG_OPTIONS=--with-gmp="$(GMP_TARGET_DIR)"
BINUTILS_TARGET_CONFIG_OPTIONS+=--with-mpfr="$(MPFR_TARGET_DIR)"
endif
-BINUTILS_OFFICIAL_VERSION:=$(BINUTILS_VERSION)$(VENDOR_SUFFIX)$(VENDOR_BINUTILS_RELEASE)
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
BINUTILS_PATCH_DIR:=toolchain/binutils/$(BINUTILS_VERSION)
-else # ifeq ($(BR2_TOOLCHAIN_EXTERNAL_SOURCE),)
-BINUTILS_SITE:=$(VENDOR_SITE)
-BINUTILS_PATCH_DIR:=toolchain/binutils/ext_source/$(VENDOR_PATCH_DIR)/$(BINUTILS_OFFICIAL_VERSION)
-endif
ifneq ($(filter xtensa%,$(ARCH)),)
include target/xtensa/patch.in
BINUTILS_PATCH_EXTRA:=$(call XTENSA_PATCH,binutils,$(BINUTILS_PATCH_DIR),. ..)
endif
-BINUTILS_SOURCE:=binutils-$(BINUTILS_OFFICIAL_VERSION).tar.bz2
-BINUTILS_DIR:=$(TOOLCHAIN_DIR)/binutils-$(BINUTILS_OFFICIAL_VERSION)
+BINUTILS_SOURCE:=binutils-$(BINUTILS_VERSION).tar.bz2
+BINUTILS_DIR:=$(TOOLCHAIN_DIR)/binutils-$(BINUTILS_VERSION)
BINUTILS_CAT:=$(BZCAT)
BINUTILS_DIR1:=$(TOOLCHAIN_DIR)/binutils-$(BINUTILS_VERSION)-build
@@ -79,7 +76,9 @@ $(BINUTILS_DIR)/.unpacked: $(DL_DIR)/$(BINUTILS_SOURCE)
binutils-patched: $(BINUTILS_DIR)/.patched
$(BINUTILS_DIR)/.patched: $(BINUTILS_DIR)/.unpacked
# Apply appropriate binutils patches.
+ifneq ($(wildcard $(BINUTILS_PATCH_DIR)),)
toolchain/patch-kernel.sh $(BINUTILS_DIR) $(BINUTILS_PATCH_DIR) \*.patch $(BINUTILS_PATCH_EXTRA)
+endif
touch $@
$(BINUTILS_DIR1)/.configured: $(BINUTILS_DIR)/.patched
diff --git a/toolchain/binutils/ext_source/Atmel/avr32/2.17-avr32-2.0/.empty b/toolchain/binutils/ext_source/Atmel/avr32/2.17-avr32-2.0/.empty
deleted file mode 100644
index e69de29bb..000000000
--- a/toolchain/binutils/ext_source/Atmel/avr32/2.17-avr32-2.0/.empty
+++ /dev/null
diff --git a/toolchain/binutils/ext_source/Atmel/avr32/2.17-avr32-2.1.3/.empty b/toolchain/binutils/ext_source/Atmel/avr32/2.17-avr32-2.1.3/.empty
deleted file mode 100644
index e69de29bb..000000000
--- a/toolchain/binutils/ext_source/Atmel/avr32/2.17-avr32-2.1.3/.empty
+++ /dev/null
diff --git a/toolchain/binutils/ext_source/Atmel/avr32/2.17-avr32-2.1.5/.empty b/toolchain/binutils/ext_source/Atmel/avr32/2.17-avr32-2.1.5/.empty
deleted file mode 100644
index e69de29bb..000000000
--- a/toolchain/binutils/ext_source/Atmel/avr32/2.17-avr32-2.1.5/.empty
+++ /dev/null
diff --git a/toolchain/binutils/ext_source/Atmel/avr32/2.18-avr32-1.0.1/.empty b/toolchain/binutils/ext_source/Atmel/avr32/2.18-avr32-1.0.1/.empty
deleted file mode 100644
index e69de29bb..000000000
--- a/toolchain/binutils/ext_source/Atmel/avr32/2.18-avr32-1.0.1/.empty
+++ /dev/null