Commit 01426334 authored by Ulf Samuelsson's avatar Ulf Samuelsson
Browse files

reinstate AVR32 toolchain

parent 6b63009f

target/device/Toolchain.in

+19 −8
Original line number Diff line number Diff line 
if BR2_TOOLCHAIN_EXTERNAL_SOURCE

choice

	prompt "Source location:"

#	default BR2_TOOLCHAIN_ATMEL_AVR32 if BR2_avr32

	default BR2_TOOLCHAIN_NORMAL		if!BR2_avr32

	default BR2_TOOLCHAIN_ATMEL_AVR32	if BR2_avr32

	depends on BR2_TOOLCHAIN_BUILDROOT

	help

	  Select whether to use the toolchain built by the buildroot

	  system or an external pre-built toolchain.



config BR2_TOOLCHAIN_NORMAL

	bool

	prompt "Use default sources for toolchain"

	depends on !BR2_avr32

	help

	  Download vanilla binutils, gcc, uclibc and gdb from their 

	  main download locations, and apply patches from the

	  "toolchain/<package>" directores.

	  I.E: Do not download a prepatched vendor source suite.



config BR2_TOOLCHAIN_ATMEL_AVR32

	bool "Use prepatched source for AVR32 toolchain"

	bool

	prompt "Use prepatched source for AVR32 toolchain"

	depends on BR2_avr32

#	depends on BR2_GCC_VERSION_4_1_2

#	depends on BR2_GDB_VERSION_6_4 || !BR2_PACKAGE_GDB

#	depends on BR2_BINUTILS_VERSION_2_17

#	depends on BR2_UCLIBC_VERSION_0_9_28_3

	depends on BR2_GCC_VERSION_4_1_2

	depends on BR2_GDB_VERSION_6_4 || !BR2_PACKAGE_GDB

	depends on BR2_BINUTILS_VERSION_2_17

	depends on BR2_UCLIBC_VERSION_0_9_28_3



endchoice
@@ -43,4 +55,3 @@ config BR2_VENDOR_GDB_RELEASE 
config BR2_VENDOR_PATCH_DIR

	string

	default "target/device/Atmel/toolchain/avr32" if BR2_TOOLCHAIN_ATMEL_AVR32
 
endif

toolchain/Config.in

+3 −15
Original line number Diff line number Diff line
@@ -3,28 +3,16 @@ choice 
	prompt "Toolchain type"

	default BR2_TOOLCHAIN_BUILDROOT

	help

	  Select whether to use the toolchain provided by buildroot

	  or an external toolchain.



	  Some vendors provide toolchains in binary form, some in

	  source form.

	  Select whether to use the toolchain built by the buildroot

	  system or an external pre-built toolchain.



config BR2_TOOLCHAIN_BUILDROOT

	bool "Buildroot toolchain"

	depends on !BR2_avr32



config BR2_TOOLCHAIN_EXTERNAL

	bool "External binary toolchain"



config BR2_TOOLCHAIN_EXTERNAL_SOURCE

	bool "External source toolchain"

	bool "External toolchain"

endchoice



config BR2_TOOLCHAIN_SOURCE

	bool

	default y if BR2_TOOLCHAIN_BUILDROOT || BR2_TOOLCHAIN_EXTERNAL_SOURCE

	default n if BR2_TOOLCHAIN_EXTERNAL



source "target/device/Toolchain.in"



source "toolchain/Config.in.2"

toolchain/binutils/binutils.mk

+2 −2
Original line number Diff line number Diff line
@@ -65,13 +65,13 @@ BINUTILS_TARGET_CONFIG_OPTIONS=--with-gmp="$(GMP_TARGET_DIR)" 
BINUTILS_TARGET_CONFIG_OPTIONS+=--with-mpfr="$(MPFR_TARGET_DIR)"

endif



ifeq ($(BR2_TOOLCHAIN_SOURCE),)

ifeq ($(BR2_TOOLCHAIN_NORMAL),)

BINUTILS_SITE:=$(VENDOR_SITE)

endif



BINUTILS_OFFICIAL_VERSION:=$(BINUTILS_VERSION)$(VENDOR_SUFFIX)$(VENDOR_BINUTILS_RELEASE)



ifeq ($(BR2_TOOLCHAIN_SOURCE),y)

ifeq ($(BR2_TOOLCHAIN_NORMAL),y)

BINUTILS_PATCH_DIR:=toolchain/binutils/$(BINUTILS_VERSION)

else

BINUTILS_PATCH_DIR:=$(VENDOR_PATCH_DIR)/binutils-$(BINUTILS_OFFICIAL_VERSION)

toolchain/external-toolchain/Config.in

+3 −4
Original line number Diff line number Diff line 
#



if BR2_TOOLCHAIN_EXTERNAL

comment "External Toolchain Options"



menu "External Toolchain Options"

       depends on BR2_TOOLCHAIN_EXTERNAL



config BR2_TOOLCHAIN_EXTERNAL_LIB_C

	string "The core C library from the external toolchain"
@@ -105,4 +104,4 @@ config BR2_TARGET_OPTIMIZATION 
	help

	  Optimizations to use when building for the target host.



endif
 
endmenu

toolchain/gcc/gcc-uclibc-3.x.mk

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ endif 




# redefine if using an external prepatched gcc source

ifeq ($(BR2_TOOLCHAIN_SOURCE),)

ifeq ($(BR2_TOOLCHAIN_NORMAL),)

GCC_SITE:=$(VENDOR_SITE)

GCC_OFFICIAL_VER:=$(GCC_VERSION)$(VENDOR_SUFFIX)$(VENDOR_GCC_RELEASE)

endif
@@ -41,7 +41,7 @@ endif 
GCC_SOURCE:=gcc-$(GCC_OFFICIAL_VER).tar.bz2

GCC_DIR:=$(TOOL_BUILD_DIR)/gcc-$(GCC_OFFICIAL_VER)



ifeq ($(BR2_TOOLCHAIN_SOURCE),y)

ifeq ($(BR2_TOOLCHAIN_NORMAL),y)

ifeq ($(GCC_SNAP_DATE),)

GCC_PATCH_DIR:=toolchain/gcc/$(GCC_VERSION)

else