Merge branch 'remove-external-toolchain' of git://git.busybox.net/~tpetazzoni/git/buildroot

4 files changed, 2 insertions, 449 deletions

diff --git a/target/Config.in b/target/Config.in
index ab46dcb16..4cae66cf7 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -74,7 +74,7 @@ config BR2_KERNEL_LINUX_ADVANCED
 # The kernel with the same version as linux headers cannot be compiled
 # when using an external toolchain, because the linux headers are not
 # handled by Buildroot in this case.
-if BR2_TOOLCHAIN_SOURCE
+if BR2_TOOLCHAIN_BUILDROOT
 
 config BR2_KERNEL_LINUX
 	bool "linux (Same version as linux headers)"
diff --git a/target/device/Atmel/uClibc.config.avr32 b/target/device/Atmel/uClibc.config.avr32
deleted file mode 100644
index d153a4dd8..000000000
--- a/target/device/Atmel/uClibc.config.avr32
+++ /dev/null
@@ -1,227 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Version: 0.9.30
-# Thu Jan 29 21:33:38 2009
-#
-# TARGET_alpha is not set
-# TARGET_arm is not set
-TARGET_avr32=y
-# TARGET_bfin is not set
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-# TARGET_i386 is not set
-# TARGET_i960 is not set
-# TARGET_ia64 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-# TARGET_mips is not set
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-# TARGET_powerpc is not set
-# TARGET_sh is not set
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_vax is not set
-# TARGET_x86_64 is not set
-# TARGET_xtensa is not set
-
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="avr32"
-FORCE_OPTIONS_FOR_ARCH=y
-CONFIG_AVR32_AP7=y
-LINKRELAX=y
-TARGET_SUBARCH=""
-
-#
-# Using ELF file format
-#
-ARCH_BIG_ENDIAN=y
-
-#
-# Using Big Endian
-#
-ARCH_HAS_MMU=y
-ARCH_USE_MMU=y
-UCLIBC_HAS_FLOATS=y
-# UCLIBC_HAS_FPU is not set
-UCLIBC_HAS_SOFT_FLOAT=y
-DO_C99_MATH=y
-# UCLIBC_HAS_FENV is not set
-KERNEL_HEADERS="/home/ulf/projects/Buildroot/20090129/buildroot/toolchain_build_avr32/linux/include"
-HAVE_DOT_CONFIG=y
-
-#
-# General Library Settings
-#
-# HAVE_NO_PIC is not set
-DOPIC=y
-# ARCH_HAS_NO_SHARED is not set
-# ARCH_HAS_NO_LDSO is not set
-HAVE_SHARED=y
-FORCE_SHAREABLE_TEXT_SEGMENTS=y
-LDSO_LDD_SUPPORT=y
-LDSO_CACHE_SUPPORT=y
-# LDSO_PRELOAD_FILE_SUPPORT is not set
-LDSO_BASE_FILENAME="ld.so"
-# UCLIBC_STATIC_LDCONFIG is not set
-# LDSO_RUNPATH is not set
-UCLIBC_CTOR_DTOR=y
-# LDSO_GNU_HASH_SUPPORT is not set
-# HAS_NO_THREADS is not set
-UCLIBC_HAS_THREADS=y
-# PTHREADS_DEBUG_SUPPORT is not set
-LINUXTHREADS_OLD=y
-UCLIBC_HAS_SYSLOG=y
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-# COMPAT_ATEXIT is not set
-UCLIBC_SUSV3_LEGACY=y
-UCLIBC_SUSV3_LEGACY_MACROS=y
-# UCLIBC_HAS_STUBS is not set
-UCLIBC_HAS_SHADOW=y
-UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
-UCLIBC_HAS___PROGNAME=y
-UCLIBC_HAS_PTY=y
-ASSUME_DEVPTS=y
-UNIX98PTY_ONLY=y
-# UCLIBC_HAS_GETPT is not set
-UCLIBC_HAS_TM_EXTENSIONS=y
-UCLIBC_HAS_TZ_CACHING=y
-UCLIBC_HAS_TZ_FILE=y
-UCLIBC_HAS_TZ_FILE_READ_MANY=y
-UCLIBC_TZ_FILE_PATH="/etc/TZ"
-
-#
-# Advanced Library Settings
-#
-UCLIBC_PWD_BUFFER_SIZE=256
-UCLIBC_GRP_BUFFER_SIZE=256
-
-#
-# Support various families of functions
-#
-UCLIBC_LINUX_MODULE_24=y
-UCLIBC_LINUX_SPECIFIC=y
-UCLIBC_HAS_GNU_ERROR=y
-UCLIBC_BSD_SPECIFIC=y
-UCLIBC_HAS_BSD_ERR=y
-# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
-# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
-# UCLIBC_NTP_LEGACY is not set
-# UCLIBC_SV4_DEPRECATED is not set
-UCLIBC_HAS_REALTIME=y
-UCLIBC_HAS_ADVANCED_REALTIME=y
-UCLIBC_HAS_EPOLL=y
-UCLIBC_HAS_XATTR=y
-UCLIBC_HAS_PROFILING=y
-UCLIBC_HAS_CRYPT_IMPL=y
-UCLIBC_HAS_CRYPT=y
-UCLIBC_HAS_NETWORK_SUPPORT=y
-UCLIBC_HAS_SOCKET=y
-UCLIBC_HAS_IPV4=y
-UCLIBC_HAS_IPV6=y
-UCLIBC_HAS_RPC=y
-UCLIBC_HAS_FULL_RPC=y
-UCLIBC_HAS_REENTRANT_RPC=y
-# UCLIBC_USE_NETLINK is not set
-# UCLIBC_HAS_BSD_RES_CLOSE is not set
-
-#
-# String and Stdio Support
-#
-UCLIBC_HAS_STRING_GENERIC_OPT=y
-UCLIBC_HAS_STRING_ARCH_OPT=y
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-# UCLIBC_HAS_CTYPE_UNSAFE is not set
-UCLIBC_HAS_CTYPE_CHECKED=y
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-UCLIBC_HAS_WCHAR=y
-UCLIBC_HAS_LOCALE=y
-# UCLIBC_PREGENERATED_LOCALE_DATA is not set
-# UCLIBC_HAS_XLOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-# UCLIBC_HAS_GLIBC_DIGIT_GROUPING is not set
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-UCLIBC_HAS_STDIO_BUFSIZ_4096=y
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-UCLIBC_HAS_STDIO_GETC_MACRO=y
-UCLIBC_HAS_STDIO_PUTC_MACRO=y
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-# UCLIBC_HAS_SYS_ERRLIST is not set
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_GNU_GETSUBOPT=y
-
-#
-# Big and Tall
-#
-UCLIBC_HAS_REGEX=y
-UCLIBC_HAS_REGEX_OLD=y
-UCLIBC_HAS_FNMATCH=y
-UCLIBC_HAS_FNMATCH_OLD=y
-UCLIBC_HAS_WORDEXP=y
-UCLIBC_HAS_FTW=y
-UCLIBC_HAS_GLOB=y
-UCLIBC_HAS_GNU_GLOB=y
-
-#
-# Library Installation Options
-#
-SHARED_LIB_LOADER_PREFIX="/lib"
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="/usr/"
-
-#
-# Security options
-#
-# UCLIBC_HAS_ARC4RANDOM is not set
-# HAVE_NO_SSP is not set
-# UCLIBC_HAS_SSP is not set
-UCLIBC_BUILD_RELRO=y
-# UCLIBC_BUILD_NOW is not set
-UCLIBC_BUILD_NOEXECSTACK=y
-
-#
-# uClibc development/debugging options
-#
-CROSS_COMPILER_PREFIX="/home/ulf/projects/Buildroot/20090129/buildroot/build_avr32/staging_dir/usr/bin/avr32-linux-uclibc-"
-UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
-# DODEBUG_PT is not set
-DOSTRIP=y
-# DOASSERTS is not set
-# SUPPORT_LD_DEBUG is not set
-# SUPPORT_LD_DEBUG_EARLY is not set
-# UCLIBC_MALLOC_DEBUGGING is not set
-WARNINGS="-Wall"
-# EXTRA_WARNINGS is not set
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set
diff --git a/target/device/Config.in.toolchain b/target/device/Config.in.toolchain
deleted file mode 100644
index b610d1dc1..000000000
--- a/target/device/Config.in.toolchain
+++ /dev/null
@@ -1,219 +0,0 @@
-if BR2_TOOLCHAIN_EXTERNAL_SOURCE
-choice
-	prompt "Source location:"
-	default BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2 if BR2_avr32
-	help
-	  Select whether to use the toolchain built by the buildroot
-	  system or an external pre-built toolchain.
-
-config BR2_TOOLCHAIN_ATMEL_AVR32_4_1_2
-	bool "Use prepatched source for AVR32 gcc-4.1.2 toolchain"
-	depends on BR2_avr32
-	depends on BR2_DEPRECATED
-	select BR2_EXT_GCC_VERSION_4_1_2
-	select BR2_EXT_BINUTILS_VERSION_2_17
-	select BR2_EXT_UCLIBC_VERSION_0_9_29
-	select BR2_TOOLCHAIN_ATMEL_AVR32
-	help
-	  The gcc-4.1.2 toolchain for the AVR32
-
-config BR2_TOOLCHAIN_ATMEL_AVR32_4_2_1
-	bool "Use prepatched source for AVR32 gcc-4.2.1 toolchain"
-	depends on BR2_avr32
-	depends on BR2_DEPRECATED
-	select BR2_EXT_GCC_VERSION_4_2_1
-	select BR2_EXT_BINUTILS_VERSION_2_17
-	select BR2_EXT_UCLIBC_VERSION_0_9_29
-	select BR2_TOOLCHAIN_ATMEL_AVR32
-	select BR2_GCC_SUPPORTS_SYSROOT
-	help
-	  The gcc-4.2.1 toolchain for the AVR32
-	  * gcc-4.2.1
-	  * binutils-2.17
-	  * uClibc-0.9.29
-	  * gdb-6.4
-	  This will not be able to build qtopia
-	  due to internal errors.
-
-config BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2
-	bool "Use prepatched source for AVR32 gcc-4.2.2 toolchain"
-	depends on BR2_avr32
-	depends on BR2_DEPRECATED
-	select BR2_EXT_GCC_VERSION_4_2_2
-	select BR2_EXT_BINUTILS_VERSION_2_17
-	select BR2_EXT_UCLIBC_VERSION_0_9_29
-	select BR2_TOOLCHAIN_ATMEL_AVR32
-	select BR2_GCC_SUPPORTS_SYSROOT
-	help
-	  The gcc-4.2.2 toolchain for the AVR32
-	  * gcc-4.2.2
-	  * binutils-2.17
-	  * uClibc-0.9.29
-	  * gdb-6.7.1
-	  It is generated from buildroot-avr32-v2.2.0-rc4
-	  in http://www.atmel.no/buildroot
-
-config BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2_REV_2
-	bool "Use prepatched source for AVR32 gcc-4.2.2 toolchain"
-	depends on BR2_avr32
-	select BR2_EXT_GCC_VERSION_4_2_2
-	select BR2_EXT_BINUTILS_VERSION_2_18
-	select BR2_EXT_UCLIBC_VERSION_0_9_30
-	select BR2_TOOLCHAIN_ATMEL_AVR32
-	select BR2_GCC_SUPPORTS_SYSROOT
-	help
-	  The gcc-4.2.2 toolchain for the AVR32
-	  * gcc-4.2.2
-	  * binutils-2.18
-	  * uClibc-0.9.29/30
-	  * gdb-6.7.1
-	  It is generated from buildroot-avr32-v2.3.0-rc1
-	  in http://www.atmel.no/buildroot
-
-config BR2_TOOLCHAIN_ATMEL_AVR32_4_2_3
-	bool "Use prepatched source for AVR32 gcc-4.2.3 toolchain"
-	depends on BR2_avr32
-	depends on BR2_DEPRECATED
-	depends on BR2_TOOLCHAIN_ATMEL_AVR32_4_2_3_ENABLE
-	select BR2_EXT_GCC_VERSION_4_2_3
-	select BR2_EXT_BINUTILS_VERSION_2_17
-	select BR2_EXT_UCLIBC_VERSION_0_9_29
-	select BR2_EXT_UCLIBC_VERSION_0_9_30
-	select BR2_TOOLCHAIN_ATMEL_AVR32
-	help
-	  The gcc-4.2.3 toolchain for the AVR32
-	  * gcc-4.2.3
-	  * binutils-2.17
-	  * uClibc-0.9.29
-	  * gdb-6.7.1
-	  It is generated from buildroot-avr32-v2.2.0-rc4
-	  in http://www.atmel.no/buildroot
-
-config BR2_TOOLCHAIN_UNKNOWNVENDOR
-	bool "Use prepatched source from unknown vendor"
-	depends on !BR2_avr32
-
-endchoice
-
-config BR2_TOOLCHAIN_ATMEL_AVR32_4_2_3_ENABLE
-	bool
-
-config BR2_TOOLCHAIN_ATMEL_AVR32
-	bool
-
-if BR2_TOOLCHAIN_ATMEL_AVR32
-config BR2_VENDOR_SITE
-	string
-	default "$(BR2_ATMEL_MIRROR)" if BR2_TOOLCHAIN_ATMEL_AVR32
-
-config BR2_VENDOR_SUFFIX
-	string
-	default "-avr32" if BR2_TOOLCHAIN_ATMEL_AVR32
-
-config BR2_VENDOR_BINUTILS_RELEASE
-	string
-	default "-2.1.3" if BR2_TOOLCHAIN_ATMEL_AVR32_4_1_2
-	default "-2.1.3" if BR2_TOOLCHAIN_ATMEL_AVR32_4_2_1
-	default "-2.1.5" if BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2
-	default "-1.0.1" if BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2_REV_2
-	default "-2.1.5" if BR2_TOOLCHAIN_ATMEL_AVR32_4_2_3
-
-config BR2_VENDOR_GCC_RELEASE
-	string
-	default "-2.0" if BR2_TOOLCHAIN_ATMEL_AVR32_4_1_2
-	default "-2.1.3" if BR2_TOOLCHAIN_ATMEL_AVR32_4_2_1
-	default "-2.1.5" if BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2
-	default "-1.1.3" if BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2_REV_2
-	default "-2.1.5" if BR2_TOOLCHAIN_ATMEL_AVR32_4_2_3
-
-config BR2_VENDOR_UCLIBC_RELEASE
-	string
-	default "-2.1.3" if BR2_TOOLCHAIN_ATMEL_AVR32_4_1_2
-	default "-2.1.3" if BR2_TOOLCHAIN_ATMEL_AVR32_4_2_1
-	default "-2.1.5" if BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2
-	default "-2.1.5" if BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2_REV_2
-	default "-2.1.5" if BR2_TOOLCHAIN_ATMEL_AVR32_4_2_3
-
-config BR2_VENDOR_GDB_RELEASE
-	string
-	default "-2.1.3" if BR2_GDB_VERSION_6_4
-	default "-2.1.3" if BR2_GDB_VERSION_6_4
-	default "-2.1.5" if BR2_GDB_VERSION_6_7_1
-
-config BR2_VENDOR_PATCH_DIR
-	string
-	default "Atmel/avr32" if BR2_TOOLCHAIN_ATMEL_AVR32
-endif
-if BR2_TOOLCHAIN_UNKNOWNVENDOR
-config BR2_VENDOR_SITE
-	string "vendor site"
-	default "http://vendor.com/somewhere/"
-
-config BR2_VENDOR_SUFFIX
-	string "vendor suffix"
-	default ""
-
-config BR2_VENDOR_BINUTILS_RELEASE
-	string "binutils suffix"
-	default ""
-
-config BR2_VENDOR_GCC_RELEASE
-	string "gcc suffix"
-	default ""
-
-config BR2_VENDOR_UCLIBC_RELEASE
-	string "uClibc suffix"
-	default ""
-
-config BR2_VENDOR_GDB_RELEASE
-	string "gdb suffix"
-	default ""
-
-config BR2_VENDOR_PATCH_DIR
-	string "local accumulated patchdir"
-	default "$(VENDOR)/$(ARCH)/"
-endif
-
-
-endif
-
-
-config	BR2_EXT_GCC_VERSION_4_1_2
-	bool
-	default !BR2_TOOLCHAIN_EXTERNAL_SOURCE
-
-config	BR2_EXT_GCC_VERSION_4_2_1
-	bool
-	default !BR2_TOOLCHAIN_EXTERNAL_SOURCE
-
-config	BR2_EXT_GCC_VERSION_4_2_2
-	bool
-	default !BR2_TOOLCHAIN_EXTERNAL_SOURCE
-
-config	BR2_EXT_GCC_VERSION_4_2_3
-	bool
-	default !BR2_TOOLCHAIN_EXTERNAL_SOURCE
-
-config	BR2_EXT_BINUTILS_VERSION_2_17
-	bool
-	default !BR2_TOOLCHAIN_EXTERNAL_SOURCE
-
-config	BR2_EXT_BINUTILS_VERSION_2_18
-	bool
-	default !BR2_TOOLCHAIN_EXTERNAL_SOURCE
-
-config	BR2_EXT_UCLIBC_VERSION_0_9_28_3
-	bool
-	default !BR2_TOOLCHAIN_EXTERNAL_SOURCE
-
-config	BR2_EXT_UCLIBC_VERSION_0_9_29
-	bool
-	default !BR2_TOOLCHAIN_EXTERNAL_SOURCE
-
-config	BR2_EXT_UCLIBC_VERSION_0_9_30
-	bool
-	default !BR2_TOOLCHAIN_EXTERNAL_SOURCE
-
-config	BR2_EXT_UCLIBC_VERSION_0_9_30_1
-	bool
-	default !BR2_TOOLCHAIN_EXTERNAL_SOURCE
diff --git a/target/xtensa/defconfig b/target/xtensa/defconfig
index f7a574173..07ab10bf4 100644
--- a/target/xtensa/defconfig
+++ b/target/xtensa/defconfig
@@ -85,9 +85,8 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
 BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
 
 
-## These two added by Maxim
+## Added by Maxim
 BR2_TOOLCHAIN_BUILDROOT=y
-BR2_TOOLCHAIN_SOURCE=y
 
 
 # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set