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

1 files changed, 14 insertions, 36 deletions

diff --git a/configs/atstk100x_defconfig b/configs/atstk100x_defconfig
index df09d2f32..ad91b8d86 100644
--- a/configs/atstk100x_defconfig
+++ b/configs/atstk100x_defconfig
@@ -138,34 +138,8 @@ BR2_UPDATE_CONFIG=y
 #
 # Toolchain
 #
-# BR2_TOOLCHAIN_BUILDROOT is not set
+BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
-BR2_TOOLCHAIN_EXTERNAL_SOURCE=y
-BR2_TOOLCHAIN_SOURCE=y
-# BR2_TOOLCHAIN_ATMEL_AVR32_4_1_2 is not set
-# BR2_TOOLCHAIN_ATMEL_AVR32_4_2_1 is not set
-# BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2 is not set
-BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2_REV_2=y
-# BR2_TOOLCHAIN_ATMEL_AVR32_4_2_3 is not set
-# BR2_TOOLCHAIN_UNKNOWNVENDOR is not set
-BR2_TOOLCHAIN_ATMEL_AVR32=y
-BR2_VENDOR_SITE="$(BR2_ATMEL_MIRROR)"
-BR2_VENDOR_SUFFIX="-avr32"
-BR2_VENDOR_BINUTILS_RELEASE="-1.0.1"
-BR2_VENDOR_GCC_RELEASE="-1.1.3"
-BR2_VENDOR_UCLIBC_RELEASE="-2.1.5"
-BR2_VENDOR_GDB_RELEASE="-2.1.5"
-BR2_VENDOR_PATCH_DIR="Atmel/avr32"
-# BR2_EXT_GCC_VERSION_4_1_2 is not set
-# BR2_EXT_GCC_VERSION_4_2_1 is not set
-BR2_EXT_GCC_VERSION_4_2_2=y
-# BR2_EXT_GCC_VERSION_4_2_3 is not set
-# BR2_EXT_BINUTILS_VERSION_2_17 is not set
-BR2_EXT_BINUTILS_VERSION_2_18=y
-# BR2_EXT_UCLIBC_VERSION_0_9_28_3 is not set
-# BR2_EXT_UCLIBC_VERSION_0_9_29 is not set
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
-# BR2_EXT_UCLIBC_VERSION_0_9_30_1 is not set
 
 #
 # Kernel Header Options
@@ -185,11 +159,12 @@ BR2_DEFAULT_KERNEL_HEADERS="2.6.28.9"
 #
 # BR2_UCLIBC_VERSION_0_9_28_3 is not set
 # BR2_UCLIBC_VERSION_0_9_29 is not set
-BR2_UCLIBC_VERSION_0_9_30=y
+# BR2_UCLIBC_VERSION_0_9_30 is not set
+BR2_UCLIBC_VERSION_0_9_30_AVR32_2_1_5=y
 # BR2_UCLIBC_VERSION_0_9_30_1 is not set
 # BR2_UCLIBC_VERSION_SNAPSHOT is not set
-BR2_UCLIBC_VERSION_STRING="0.9.30"
-BR2_UCLIBC_CONFIG="target/device/Atmel/uClibc.config.avr32"
+BR2_UCLIBC_VERSION_STRING="0.9.30-avr32-2.1.5"
+BR2_UCLIBC_CONFIG="toolchain/uClibc/uClibc-0.9.30.config"
 # BR2_PTHREAD_DEBUG is not set
 BR2_PROGRAM_INVOCATION=y
 # BR2_UCLIBC_INSTALL_TEST_SUITE is not set
@@ -199,15 +174,16 @@ BR2_PROGRAM_INVOCATION=y
 #
 # BR2_BINUTILS_VERSION_2_17 is not set
 # BR2_BINUTILS_VERSION_2_17_50_0_17 is not set
-BR2_BINUTILS_VERSION_2_18=y
+# BR2_BINUTILS_VERSION_2_18 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_1 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_3 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_6 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_8 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_9 is not set
+BR2_BINUTILS_VERSION_2_18_AVR32_1_0_1=y
 # BR2_BINUTILS_VERSION_2_19 is not set
 # BR2_BINUTILS_VERSION_2_19_1 is not set
-BR2_BINUTILS_VERSION="2.18"
+BR2_BINUTILS_VERSION="2.18-avr32-1.0.1"
 BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
 
 #
@@ -217,7 +193,8 @@ BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
 # BR2_GCC_VERSION_4_0_4 is not set
 # BR2_GCC_VERSION_4_1_2 is not set
 # BR2_GCC_VERSION_4_2_1 is not set
-BR2_GCC_VERSION_4_2_2=y
+# BR2_GCC_VERSION_4_2_2 is not set
+BR2_GCC_VERSION_4_2_2_AVR32_2_1_5=y
 # BR2_GCC_VERSION_4_2_3 is not set
 # BR2_GCC_VERSION_4_2_4 is not set
 # BR2_GCC_VERSION_4_3_1 is not set
@@ -226,7 +203,7 @@ BR2_GCC_VERSION_4_2_2=y
 # BR2_GCC_VERSION_4_4_X is not set
 BR2_GCC_SUPPORTS_SYSROOT=y
 # BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
-BR2_GCC_VERSION="4.2.2"
+BR2_GCC_VERSION="4.2.2-avr32-2.1.5"
 BR2_TOOLCHAIN_SYSROOT=y
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
@@ -248,10 +225,11 @@ BR2_PACKAGE_GDB_HOST=y
 # BR2_GDB_VERSION_6_4 is not set
 # BR2_GDB_VERSION_6_5 is not set
 # BR2_GDB_VERSION_6_6 is not set
-BR2_GDB_VERSION_6_7_1=y
+# BR2_GDB_VERSION_6_7_1 is not set
+BR2_GDB_VERSION_6_7_1_AVR32_2_1_5=y
 # BR2_GDB_VERSION_6_8 is not set
 # BR2_GDB_VERSION_SNAPSHOT is not set
-BR2_GDB_VERSION="6.7.1"
+BR2_GDB_VERSION="6.7.1-avr32-2.1.5"
 
 #
 # Common Toolchain Options