Commit 063593b7 authored by Romain Naour's avatar Romain Naour Committed by Thomas Petazzoni
Browse files

toolchain-external: ADI Blackfin: support only one version 

See the conclusion about external toolchains during the Buildroot
meeting [1]:
"In the future, we stick to a single external toolchain version. The
Kconfig symbol should not encode the version (avoid legacy handling)"

[1] http://elinux.org/index.php?title=Buildroot:DeveloperDaysELCE2015#Report



Remove old ADI toolchain handling in glog, openpgm and zeromq.

Signed-off-by: default avatarRomain Naour <romain.naour@openwide.fr>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent f4da09ea

package/glog/Config.in

+3 −5
Original line number Diff line number Diff line
@@ -3,16 +3,14 @@ config BR2_PACKAGE_GLOG 
	depends on BR2_INSTALL_LIBSTDCPP

	depends on BR2_TOOLCHAIN_HAS_THREADS

	depends on !BR2_STATIC_LIBS

	# build issues with these external toolchains

	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2014R1

	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2013R1

	# build issues with this external toolchain

	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX

	help

	  C++ implementation of the Google logging module



	  https://github.com/google/glog



comment "glog needs a toolchain w/ C++, threads, dynamic library"

	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2014R1

	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2013R1

	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX

	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \

		BR2_STATIC_LIBS

package/openpgm/Config.in

+2 −3
Original line number Diff line number Diff line 
config BR2_PACKAGE_OPENPGM

	bool "openpgm"

	# The following toolchains lack required compiler intrinsics

	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2014R1

	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2013R1

	# This toolchain lack required compiler intrinsics

	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX

	depends on BR2_TOOLCHAIN_HAS_THREADS

	depends on BR2_USE_WCHAR

	help

package/zeromq/Config.in

+1 −2
Original line number Diff line number Diff line
@@ -29,8 +29,7 @@ if BR2_PACKAGE_ZEROMQ 


config BR2_PACKAGE_ZEROMQ_PGM

	bool "PGM/EPGM support"

	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2014R1 # openpgm

	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2013R1 # openpgm

	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX # openpgm

	select BR2_PACKAGE_OPENPGM

	help

	  Add support for Pragmatic General Multicast protocol (RFC 3208)

toolchain/toolchain-external/Config.in

+3 −22
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86 
	  Other architecture variants (beyond Pentium-4/Xeon) are

	  supported as well, but glibc is not optimised for it.



config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2014R1

config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX

	bool "Blackfin.uclinux.org 2014R1"

	depends on BR2_bfin

	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
@@ -398,23 +398,6 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2014R1 
	  Toolchain for the Blackfin architecture, from

	  http://blackfin.uclinux.org.



config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2013R1

	bool "Blackfin.uclinux.org 2013R1"

	depends on BR2_bfin

	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"

	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC

	select BR2_INSTALL_LIBSTDCPP

	select BR2_TOOLCHAIN_HAS_NATIVE_RPC

	select BR2_USE_WCHAR

	select BR2_TOOLCHAIN_HAS_THREADS

	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG

	select BR2_HOSTARCH_NEEDS_IA32_LIBS

	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10

	select BR2_TOOLCHAIN_GCC_AT_LEAST_4_3

	help

	  Toolchain for the Blackfin architecture, from

	  http://blackfin.uclinux.org.



# See note about Linar ARM/ARMEB toolchains, above.

config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64

	bool "Linaro AArch64 14.09"
@@ -570,10 +553,8 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX 
	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH

	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86

	default "x86_64-amd-linux-gnu"   if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64

	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2013R1 && BR2_BINFMT_FLAT

	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2013R1 && BR2_BINFMT_FDPIC

	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2014R1 && BR2_BINFMT_FLAT

	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2014R1 && BR2_BINFMT_FDPIC

	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX && BR2_BINFMT_FLAT

	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX && BR2_BINFMT_FDPIC

	default "arm-linux-musleabi"	 if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_arm

	default "armeb-linux-musleabi"	 if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_armeb

	default "i486-linux-musl"	 if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_i386

toolchain/toolchain-external/toolchain-external.hash

+0 −4
Original line number Diff line number Diff line
@@ -6,11 +6,7 @@ sha256 e653102803d0fadc0a83286400c03bc7932ab081d3f8fc8917c34e76468315a2 mips-20 
# Next hashes are all locally computed



# Blackfin toolchains from Analog Devices

sha256 fba010929c7355a0286fc4b1817d6065ee21380d3c2993383d3778f0b998ca9d  blackfin-toolchain-2012R2-RC2.i386.tar.bz2

sha256 90284fe72125f381817da505b6f91f2b0c86a763ffe2c722c7d6b3ae60b25010  blackfin-toolchain-2013R1-RC1.i386.tar.bz2

sha256 e424e90d8481d942a40266d78d1488726561fed3ec38403094f98055e61889d0  blackfin-toolchain-2014R1-RC2.i386.tar.bz2

sha256 436ca3d901b152094cd6be2b6e274c59643387f46bb0563db1adcab1202f1455  blackfin-toolchain-uclibc-full-2012R2-RC2.i386.tar.bz2

sha256 4d66a3390ae9e1c4b9aad214757791a5e0c45ef2bb31977fa6d3a80d96290237  blackfin-toolchain-uclibc-full-2013R1-RC1.i386.tar.bz2

sha256 c65b1b4b918d5185349d62a3b7bf43b4b21e1175c52598ec047ca56b3f11d857  blackfin-toolchain-uclibc-full-2014R1-RC2.i386.tar.bz2



# Mentor's Sourcery CodeBench Lite toolchains