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

67 files changed, 159 insertions, 1108 deletions

diff --git a/Makefile b/Makefile
index 5b71051c1..051b661fe 100644
--- a/Makefile
+++ b/Makefile
@@ -197,7 +197,7 @@ PREFERRED_LIB_FLAGS:=--enable-static --enable-shared
 # along with the packages to build for the target.
 #
 ##############################################################
-ifeq ($(BR2_TOOLCHAIN_SOURCE),y)
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
 BASE_TARGETS:=uclibc-configured binutils cross_compiler uclibc-target-utils kernel-headers
 else
 BASE_TARGETS:=uclibc
@@ -289,7 +289,7 @@ include .config.cmd
 # We also need the various per-package makefiles, which also add
 # each selected package to TARGETS if that package was selected
 # in the .config file.
-ifeq ($(BR2_TOOLCHAIN_SOURCE),y)
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
 # avoid pulling in external toolchain which is broken for toplvl parallel builds
 # Explicit ordering:
 include toolchain/dependencies/dependencies.mk
diff --git a/configs/arm_toolchain_defconfig b/configs/arm_toolchain_defconfig
index 9e4c6c96e..e7f9358b1 100644
--- a/configs/arm_toolchain_defconfig
+++ b/configs/arm_toolchain_defconfig
@@ -190,17 +190,6 @@ BR2_UPDATE_CONFIG=y
 #
 BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-BR2_TOOLCHAIN_SOURCE=y
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
 
 #
 # Kernel Header Options
diff --git a/configs/at91rm9200df_defconfig b/configs/at91rm9200df_defconfig
index 77cf7248d..76408c003 100644
--- a/configs/at91rm9200df_defconfig
+++ b/configs/at91rm9200df_defconfig
@@ -195,17 +195,6 @@ BR2_UPDATE_CONFIG=y
 #
 BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-BR2_TOOLCHAIN_SOURCE=y
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
 
 #
 # Kernel Header Options
diff --git a/configs/at91rm9200df_ext_bare_defconfig b/configs/at91rm9200df_ext_bare_defconfig
index e7da7a80f..80257828c 100644
--- a/configs/at91rm9200df_ext_bare_defconfig
+++ b/configs/at91rm9200df_ext_bare_defconfig
@@ -190,19 +190,8 @@ BR2_UPDATE_CONFIG=y
 #
 # BR2_TOOLCHAIN_BUILDROOT is not set
 BR2_TOOLCHAIN_EXTERNAL=y
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-# BR2_TOOLCHAIN_SOURCE is not set
 BR2_TOOLCHAIN_EXTERNAL_PATH="$(GCCROOT)"
 BR2_TOOLCHAIN_EXTERNAL_PREFIX="$(ARCH)-linux"
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
 BR2_TOOLCHAIN_EXTERNAL_LIB_C="libc.so.0"
 BR2_TOOLCHAIN_EXTERNAL_LIBS="ld-uClibc.so.0 libcrypt.so.0 libdl.so.0 libgcc_s.so libm.so.0 libnsl.so.0 libpthread.so.0 libresolv.so.0 librt.so.0 libutil.so.0"
 BR2_TOOLCHAIN_EXTERNAL_STRIP=y
diff --git a/configs/at91rm9200df_ext_defconfig b/configs/at91rm9200df_ext_defconfig
index d4fa12281..2965ffee6 100644
--- a/configs/at91rm9200df_ext_defconfig
+++ b/configs/at91rm9200df_ext_defconfig
@@ -201,19 +201,8 @@ BR2_UPDATE_CONFIG=y
 #
 # BR2_TOOLCHAIN_BUILDROOT is not set
 BR2_TOOLCHAIN_EXTERNAL=y
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-# BR2_TOOLCHAIN_SOURCE is not set
 BR2_TOOLCHAIN_EXTERNAL_PATH="$(GCCROOT)"
 BR2_TOOLCHAIN_EXTERNAL_PREFIX="$(ARCH)-linux"
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
 BR2_TOOLCHAIN_EXTERNAL_LIB_C="libc.so.0"
 BR2_TOOLCHAIN_EXTERNAL_LIBS="ld-uClibc.so.0 libcrypt.so.0 libdl.so.0 libgcc_s.so libm.so.0 libnsl.so.0 libpthread.so.0 libresolv.so.0 librt.so.0 libutil.so.0"
 BR2_TOOLCHAIN_EXTERNAL_STRIP=y
diff --git a/configs/at91sam9260dfc_defconfig b/configs/at91sam9260dfc_defconfig
index d7f6e7a65..4e50465a7 100644
--- a/configs/at91sam9260dfc_defconfig
+++ b/configs/at91sam9260dfc_defconfig
@@ -208,17 +208,6 @@ BR2_UPDATE_CONFIG=y
 #
 BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-BR2_TOOLCHAIN_SOURCE=y
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
 
 #
 # Kernel Header Options
diff --git a/configs/at91sam9260dfc_ext_bare_defconfig b/configs/at91sam9260dfc_ext_bare_defconfig
index 1d272e467..b4d349acd 100644
--- a/configs/at91sam9260dfc_ext_bare_defconfig
+++ b/configs/at91sam9260dfc_ext_bare_defconfig
@@ -190,17 +190,6 @@ BR2_UPDATE_CONFIG=y
 #
 # BR2_TOOLCHAIN_BUILDROOT is not set
 BR2_TOOLCHAIN_EXTERNAL=y
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-# BR2_TOOLCHAIN_SOURCE is not set
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
 BR2_TOOLCHAIN_EXTERNAL_LIB_C="libc.so.0"
 BR2_TOOLCHAIN_EXTERNAL_LIBS="ld-uClibc.so.0 libcrypt.so.0 libdl.so.0 libgcc_s.so libm.so.0 libnsl.so.0 libpthread.so.0 libresolv.so.0 librt.so.0 libutil.so.0"
 BR2_TOOLCHAIN_EXTERNAL_STRIP=y
diff --git a/configs/at91sam9260dfc_ext_defconfig b/configs/at91sam9260dfc_ext_defconfig
index 5fd78d167..70a00dc1c 100644
--- a/configs/at91sam9260dfc_ext_defconfig
+++ b/configs/at91sam9260dfc_ext_defconfig
@@ -209,19 +209,8 @@ BR2_UPDATE_CONFIG=y
 #
 # BR2_TOOLCHAIN_BUILDROOT is not set
 BR2_TOOLCHAIN_EXTERNAL=y
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-# BR2_TOOLCHAIN_SOURCE is not set
 BR2_TOOLCHAIN_EXTERNAL_PATH="$(GCCROOT)"
 BR2_TOOLCHAIN_EXTERNAL_PREFIX="$(ARCH)-linux"
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
 BR2_TOOLCHAIN_EXTERNAL_LIB_C="libc.so.0"
 BR2_TOOLCHAIN_EXTERNAL_LIBS="ld-uClibc.so.0 libcrypt.so.0 libdl.so.0 libgcc_s.so libm.so.0 libnsl.so.0 libpthread.so.0 libresolv.so.0 librt.so.0 libutil.so.0"
 BR2_TOOLCHAIN_EXTERNAL_STRIP=y
diff --git a/configs/at91sam9261ek_defconfig b/configs/at91sam9261ek_defconfig
index bf88ff191..69b19e46e 100644
--- a/configs/at91sam9261ek_defconfig
+++ b/configs/at91sam9261ek_defconfig
@@ -211,17 +211,6 @@ BR2_UPDATE_CONFIG=y
 #
 BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-BR2_TOOLCHAIN_SOURCE=y
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
 
 #
 # Kernel Header Options
diff --git a/configs/at91sam9261ek_ext_bare_defconfig b/configs/at91sam9261ek_ext_bare_defconfig
index 22db484c6..662667b26 100644
--- a/configs/at91sam9261ek_ext_bare_defconfig
+++ b/configs/at91sam9261ek_ext_bare_defconfig
@@ -193,19 +193,8 @@ BR2_UPDATE_CONFIG=y
 #
 # BR2_TOOLCHAIN_BUILDROOT is not set
 BR2_TOOLCHAIN_EXTERNAL=y
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-# BR2_TOOLCHAIN_SOURCE is not set
 BR2_TOOLCHAIN_EXTERNAL_PATH="$(GCCROOT)"
 BR2_TOOLCHAIN_EXTERNAL_PREFIX="$(ARCH)-linux"
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
 BR2_TOOLCHAIN_EXTERNAL_LIB_C="libc.so.0"
 BR2_TOOLCHAIN_EXTERNAL_LIBS="ld-uClibc.so.0 libcrypt.so.0 libdl.so.0 libgcc_s.so libm.so.0 libnsl.so.0 libpthread.so.0 libresolv.so.0 librt.so.0 libutil.so.0"
 BR2_TOOLCHAIN_EXTERNAL_STRIP=y
diff --git a/configs/at91sam9261ek_ext_defconfig b/configs/at91sam9261ek_ext_defconfig
index 87c19046c..06cb986ee 100644
--- a/configs/at91sam9261ek_ext_defconfig
+++ b/configs/at91sam9261ek_ext_defconfig
@@ -212,19 +212,8 @@ BR2_UPDATE_CONFIG=y
 #
 # BR2_TOOLCHAIN_BUILDROOT is not set
 BR2_TOOLCHAIN_EXTERNAL=y
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-# BR2_TOOLCHAIN_SOURCE is not set
 BR2_TOOLCHAIN_EXTERNAL_PATH="$(GCCROOT)"
 BR2_TOOLCHAIN_EXTERNAL_PREFIX="$(ARCH)-linux"
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
 # BR2_KERNEL_HEADERS_2_4_31 is not set
 # BR2_KERNEL_HEADERS_2_6_20_4 is not set
 # BR2_KERNEL_HEADERS_2_6_20 is not set
diff --git a/configs/at91sam9263ek_defconfig b/configs/at91sam9263ek_defconfig
index 7ed5e9414..e8f84f8a6 100644
--- a/configs/at91sam9263ek_defconfig
+++ b/configs/at91sam9263ek_defconfig
@@ -209,17 +209,6 @@ BR2_UPDATE_CONFIG=y
 #
 BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-BR2_TOOLCHAIN_SOURCE=y
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
 
 #
 # Kernel Header Options
diff --git a/configs/at91sam9263ek_ext_bare_defconfig b/configs/at91sam9263ek_ext_bare_defconfig
index 27b2791a2..60ebfebb5 100644
--- a/configs/at91sam9263ek_ext_bare_defconfig
+++ b/configs/at91sam9263ek_ext_bare_defconfig
@@ -192,19 +192,8 @@ BR2_UPDATE_CONFIG=y
 #
 # BR2_TOOLCHAIN_BUILDROOT is not set
 BR2_TOOLCHAIN_EXTERNAL=y
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-# BR2_TOOLCHAIN_SOURCE is not set
 BR2_TOOLCHAIN_EXTERNAL_PATH="$(GCCROOT)"
 BR2_TOOLCHAIN_EXTERNAL_PREFIX="$(ARCH)-linux"
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
 BR2_TOOLCHAIN_EXTERNAL_LIB_C="libc.so.0"
 BR2_TOOLCHAIN_EXTERNAL_LIBS="ld-uClibc.so.0 libcrypt.so.0 libdl.so.0 libgcc_s.so libm.so.0 libnsl.so.0 libpthread.so.0 libresolv.so.0 librt.so.0 libutil.so.0"
 BR2_TOOLCHAIN_EXTERNAL_STRIP=y
diff --git a/configs/at91sam9263ek_ext_defconfig b/configs/at91sam9263ek_ext_defconfig
index f12f56d73..1668d2391 100644
--- a/configs/at91sam9263ek_ext_defconfig
+++ b/configs/at91sam9263ek_ext_defconfig
@@ -211,19 +211,8 @@ BR2_UPDATE_CONFIG=y
 #
 # BR2_TOOLCHAIN_BUILDROOT is not set
 BR2_TOOLCHAIN_EXTERNAL=y
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-# BR2_TOOLCHAIN_SOURCE is not set
 BR2_TOOLCHAIN_EXTERNAL_PATH="$(GCCROOT)"
 BR2_TOOLCHAIN_EXTERNAL_PREFIX="$(ARCH)-linux"
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
 BR2_TOOLCHAIN_EXTERNAL_LIB_C="libc.so.0"
 BR2_TOOLCHAIN_EXTERNAL_LIBS="ld-uClibc.so.0 libcrypt.so.0 libdl.so.0 libgcc_s.so libm.so.0 libnsl.so.0 libpthread.so.0 libresolv.so.0 librt.so.0 libutil.so.0"
 BR2_TOOLCHAIN_EXTERNAL_STRIP=y
diff --git a/configs/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig
index 83dffe950..451b29a9d 100644
--- a/configs/at91sam9g20dfc_defconfig
+++ b/configs/at91sam9g20dfc_defconfig
@@ -209,17 +209,6 @@ BR2_UPDATE_CONFIG=y
 #
 BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-BR2_TOOLCHAIN_SOURCE=y
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
 
 #
 # Kernel Header Options
diff --git a/configs/at91sam9g20dfc_ext_bare_defconfig b/configs/at91sam9g20dfc_ext_bare_defconfig
index a4af5c1a9..c503a296e 100644
--- a/configs/at91sam9g20dfc_ext_bare_defconfig
+++ b/configs/at91sam9g20dfc_ext_bare_defconfig
@@ -190,19 +190,8 @@ BR2_UPDATE_CONFIG=y
 #
 # BR2_TOOLCHAIN_BUILDROOT is not set
 BR2_TOOLCHAIN_EXTERNAL=y
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-# BR2_TOOLCHAIN_SOURCE is not set
 BR2_TOOLCHAIN_EXTERNAL_PATH="$(GCCROOT)"
 BR2_TOOLCHAIN_EXTERNAL_PREFIX="$(ARCH)-linux"
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
 BR2_TOOLCHAIN_EXTERNAL_LIB_C="libc.so.0"
 BR2_TOOLCHAIN_EXTERNAL_LIBS="ld-uClibc.so.0 libcrypt.so.0 libdl.so.0 libgcc_s.so libm.so.0 libnsl.so.0 libpthread.so.0 libresolv.so.0 librt.so.0 libutil.so.0"
 BR2_TOOLCHAIN_EXTERNAL_STRIP=y
diff --git a/configs/at91sam9g20dfc_ext_defconfig b/configs/at91sam9g20dfc_ext_defconfig
index 522952943..f8dbe9ddf 100644
--- a/configs/at91sam9g20dfc_ext_defconfig
+++ b/configs/at91sam9g20dfc_ext_defconfig
@@ -209,19 +209,8 @@ BR2_UPDATE_CONFIG=y
 #
 # BR2_TOOLCHAIN_BUILDROOT is not set
 BR2_TOOLCHAIN_EXTERNAL=y
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-# BR2_TOOLCHAIN_SOURCE is not set
 BR2_TOOLCHAIN_EXTERNAL_PATH="$(GCCROOT)"
 BR2_TOOLCHAIN_EXTERNAL_PREFIX="$(ARCH)-linux"
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
 BR2_TOOLCHAIN_EXTERNAL_LIB_C="libc.so.0"
 BR2_TOOLCHAIN_EXTERNAL_LIBS="ld-uClibc.so.0 libcrypt.so.0 libdl.so.0 libgcc_s.so libm.so.0 libnsl.so.0 libpthread.so.0 libresolv.so.0 librt.so.0 libutil.so.0"
 BR2_TOOLCHAIN_EXTERNAL_STRIP=y
diff --git a/configs/atngw100-base_defconfig b/configs/atngw100-base_defconfig
index f965630d8..14417c955 100644
--- a/configs/atngw100-base_defconfig
+++ b/configs/atngw100-base_defconfig
@@ -139,33 +139,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_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 +160,12 @@ BR2_DEFAULT_KERNEL_HEADERS="2.6.29.2"
 #
 # 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 se
+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 is not set
 # BR2_UCLIBC_INSTALL_TEST_SUITE is not set
@@ -199,15 +175,16 @@ BR2_UCLIBC_CONFIG="target/device/Atmel/uClibc.config.avr32"
 #
 # 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 +194,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 +204,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 is not set
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
index 53c5667ca..093c92c61 100644
--- a/configs/atngw100_defconfig
+++ b/configs/atngw100_defconfig
@@ -139,34 +139,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
@@ -186,11 +160,12 @@ BR2_DEFAULT_KERNEL_HEADERS="2.6.29.2"
 #
 # 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 is not set
 # BR2_UCLIBC_INSTALL_TEST_SUITE is not set
@@ -200,15 +175,16 @@ BR2_UCLIBC_CONFIG="target/device/Atmel/uClibc.config.avr32"
 #
 # 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=""
 
 #
@@ -218,7 +194,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
@@ -227,7 +204,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,9 +225,10 @@ 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="6.7.1"
+BR2_GDB_VERSION="6.7.1-avr32-2.1.5"
 
 #
 # Common Toolchain Options
diff --git a/configs/atstk1005_defconfig b/configs/atstk1005_defconfig
index ce255195a..075a8711c 100644
--- a/configs/atstk1005_defconfig
+++ b/configs/atstk1005_defconfig
@@ -139,33 +139,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
 
 #
 # Kernel Header Options
@@ -193,9 +168,10 @@ BR2_DEFAULT_KERNEL_HEADERS="2.6.28.2"
 #
 # 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_SNAPSHOT is not set
-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 is not set
 # BR2_UCLIBC_INSTALL_TEST_SUITE is not set
@@ -205,14 +181,15 @@ BR2_UCLIBC_CONFIG="target/device/Atmel/uClibc.config.avr32"
 #
 # 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.18"
+BR2_BINUTILS_VERSION="2.18-avr32-1.0.1"
 BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
 
 #
@@ -222,14 +199,15 @@ 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
 # BR2_GCC_VERSION_4_3_2 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=""
@@ -251,10 +229,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
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
diff --git a/configs/i386_defconfig b/configs/i386_defconfig
index dcc2cd376..b94f4f3e7 100644
--- a/configs/i386_defconfig
+++ b/configs/i386_defconfig
@@ -141,18 +141,6 @@ BR2_UPDATE_CONFIG=y
 #
 BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-BR2_TOOLCHAIN_SOURCE=y
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
-BR2_EXT_UCLIBC_VERSION_0_9_30_1=y
 
 #
 # Kernel Header Options
diff --git a/configs/i686_defconfig b/configs/i686_defconfig
index 063588311..51720b14d 100644
--- a/configs/i686_defconfig
+++ b/configs/i686_defconfig
@@ -141,18 +141,6 @@ BR2_UPDATE_CONFIG=y
 #
 BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-BR2_TOOLCHAIN_SOURCE=y
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
-BR2_EXT_UCLIBC_VERSION_0_9_30_1=y
 
 #
 # Kernel Header Options
diff --git a/configs/integrator926_defconfig b/configs/integrator926_defconfig
index 8f0e4ed54..a59562186 100644
--- a/configs/integrator926_defconfig
+++ b/configs/integrator926_defconfig
@@ -139,17 +139,6 @@ BR2_UPDATE_CONFIG=y
 #
 BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-BR2_TOOLCHAIN_SOURCE=y
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
 
 #
 # Kernel Header Options
diff --git a/configs/integrator926_huge_defconfig b/configs/integrator926_huge_defconfig
index eb4aa4568..d4cf50161 100644
--- a/configs/integrator926_huge_defconfig
+++ b/configs/integrator926_huge_defconfig
@@ -139,17 +139,6 @@ BR2_UPDATE_CONFIG=y
 #
 BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-BR2_TOOLCHAIN_SOURCE=y
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_GCC_VERSION_4_2_2=y
-BR2_EXT_GCC_VERSION_4_2_3=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_BINUTILS_VERSION_2_18=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_30=y
 
 #
 # Kernel Header Options
diff --git a/configs/kb9202_defconfig b/configs/kb9202_defconfig
index 880af2543..3b6b61555 100644
--- a/configs/kb9202_defconfig
+++ b/configs/kb9202_defconfig
@@ -145,13 +145,6 @@ BR2_UPDATE_CONFIG=y
 #
 BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
-# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
-BR2_TOOLCHAIN_SOURCE=y
-BR2_EXT_GCC_VERSION_4_1_2=y
-BR2_EXT_GCC_VERSION_4_2_1=y
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
 
 #
 # Kernel Header Options
diff --git a/configs/v100sc2_defconfig b/configs/v100sc2_defconfig
index 1c43f115f..6b56972ec 100644
--- a/configs/v100sc2_defconfig
+++ b/configs/v100sc2_defconfig
@@ -115,30 +115,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=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="-2.1.5"
-BR2_VENDOR_GCC_RELEASE="-2.1.5"
-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=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
-# BR2_EXT_UCLIBC_VERSION_0_9_28_3 is not set
 
 #
 # Kernel Header Options
diff --git a/package/Makefile.in b/package/Makefile.in
index 7c009bbe0..25dd6da81 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -36,7 +36,7 @@ endif
 
 
 #########################################################################
-ifeq ($(BR2_TOOLCHAIN_SOURCE),y)
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
 TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) \
 	-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
 TARGET_LDFLAGS+=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib
@@ -105,7 +105,7 @@ XXXX=xxxx
 ROOTFS_SUFFIX:=-$(BR2_ROOTFS_SUFFIX)
 endif
 
-ifeq ($(BR2_TOOLCHAIN_SOURCE),y)
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
 TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
 
 # Quotes are needed for spaces et al in path components.
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
diff --git a/toolchain/Config.in b/toolchain/Config.in
index d66ce1d38..ee34e0331 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -1,8 +1,6 @@
 menu "Toolchain"
 choice
 	prompt "Toolchain type"
-	default BR2_TOOLCHAIN_BUILDROOT if !BR2_avr32
-	default BR2_TOOLCHAIN_EXTERNAL_SOURCE if BR2_avr32
 	help
 	  Select whether to use the toolchain provided by buildroot
 	  or an external toolchain.
@@ -12,22 +10,12 @@ choice
 
 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"
 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/Config.in.toolchain"
-
 source "toolchain/Config.in.1"
 source "toolchain/external-toolchain/Config.in"
 
diff --git a/toolchain/Config.in.1 b/toolchain/Config.in.1
index 83bc710b6..5c26858d0 100644
--- a/toolchain/Config.in.1
+++ b/toolchain/Config.in.1
@@ -1,6 +1,6 @@
 #
 
-if BR2_TOOLCHAIN_SOURCE
+if BR2_TOOLCHAIN_BUILDROOT
 source "toolchain/kernel-headers/Config.in"
 source "toolchain/uClibc/Config.in"
 source "toolchain/binutils/Config.in"
diff --git a/toolchain/Config.in.2 b/toolchain/Config.in.2
index 2f7de75b6..6317ff4fb 100644
--- a/toolchain/Config.in.2
+++ b/toolchain/Config.in.2
@@ -37,7 +37,7 @@ config BR2_ENABLE_LOCALE
 
 config BR2_ENABLE_LOCALE_PREGENERATED
 	bool "Use pregenerated locale data?"
-	depends on BR2_ENABLE_LOCALE && BR2_TOOLCHAIN_SOURCE && BROKEN # tarball missing
+	depends on BR2_ENABLE_LOCALE && BR2_TOOLCHAIN_BUILDROOT && BROKEN # tarball missing
 	help
 	  Instead of generating the locale data locally you can optionally
 	  download a pregenerated set of locales.
@@ -142,7 +142,7 @@ config BR2_GCC_CROSS_CXX
 
 config BR2_INSTALL_LIBSTDCPP
 	bool "Build/install c++ compiler and libstdc++?"
-	select BR2_LARGEFILE if (!BR2_GCC_SUPPORTS_SYSROOT && BR2_TOOLCHAIN_SOURCE)
+	select BR2_LARGEFILE if (!BR2_GCC_SUPPORTS_SYSROOT && BR2_TOOLCHAIN_BUILDROOT)
 	select BR2_GCC_CROSS_CXX
 	help
 	  If you are building your own toolchain and want to build and install
@@ -157,7 +157,7 @@ config BR2_TARGET_OPTIMIZATION
 	help
 	  Optimizations to use when building for the target host.
 
-if BR2_TOOLCHAIN_SOURCE
+if BR2_TOOLCHAIN_BUILDROOT
 source "toolchain/elf2flt/Config.in"
 source "toolchain/mklibs/Config.in"
 source "toolchain/sstrip/Config.in"
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
diff --git a/toolchain/gcc/ext_source/Atmel/avr32/4.2.2-avr32-2.1.5/903-avr32-fix-removal-of-redundant-cast-operations.patch b/toolchain/gcc/4.2.2-avr32-2.1.5/903-avr32-fix-removal-of-redundant-cast-operations.patch
index 59ecbff4f..59ecbff4f 100644
--- a/toolchain/gcc/ext_source/Atmel/avr32/4.2.2-avr32-2.1.5/903-avr32-fix-removal-of-redundant-cast-operations.patch
+++ b/toolchain/gcc/4.2.2-avr32-2.1.5/903-avr32-fix-removal-of-redundant-cast-operations.patch
diff --git a/toolchain/gcc/ext_source/Atmel/avr32/4.2.2-avr32-2.1.5/904-avr32-fix-conditional-insn-which-clobbers-cc_status.patch b/toolchain/gcc/4.2.2-avr32-2.1.5/904-avr32-fix-conditional-insn-which-clobbers-cc_status.patch
index 539c666d2..539c666d2 100644
--- a/toolchain/gcc/ext_source/Atmel/avr32/4.2.2-avr32-2.1.5/904-avr32-fix-conditional-insn-which-clobbers-cc_status.patch
+++ b/toolchain/gcc/4.2.2-avr32-2.1.5/904-avr32-fix-conditional-insn-which-clobbers-cc_status.patch
diff --git a/toolchain/gcc/ext_source/Atmel/avr32/4.2.2-avr32-2.1.5/905-avr32-optimize-movsf2-use-movh-to-move-immediates-into-register.patch b/toolchain/gcc/4.2.2-avr32-2.1.5/905-avr32-optimize-movsf2-use-movh-to-move-immediates-into-register.patch
index 08d972df2..08d972df2 100644
--- a/toolchain/gcc/ext_source/Atmel/avr32/4.2.2-avr32-2.1.5/905-avr32-optimize-movsf2-use-movh-to-move-immediates-into-register.patch
+++ b/toolchain/gcc/4.2.2-avr32-2.1.5/905-avr32-optimize-movsf2-use-movh-to-move-immediates-into-register.patch
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 7e5851620..10cb841a1 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -10,26 +10,27 @@ choice
 	  Select the version of gcc you wish to use.
 
 	config BR2_GCC_VERSION_4_1_2
-		depends on !BR2_nios2
-		depends on BR2_EXT_GCC_VERSION_4_1_2
+		depends on !BR2_nios2 && !BR2_avr32
 		depends on BR2_DEPRECATED
 		bool "gcc 4.1.2"
 
 	config BR2_GCC_VERSION_4_2_1
-		depends on !BR2_nios2
-		depends on BR2_EXT_GCC_VERSION_4_2_1
+		depends on !BR2_nios2 && !BR2_avr32
 		depends on BR2_DEPRECATED
 		bool "gcc 4.2.1"
 
 	config BR2_GCC_VERSION_4_2_2
-		depends on BR2_EXT_GCC_VERSION_4_2_2
-		depends on BR2_DEPRECATED || BR2_avr32
+		depends on !BR2_avr32
+		depends on BR2_DEPRECATED
 		bool "gcc 4.2.2"
 
+	config BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
+	       depends on BR2_avr32
+	       bool "gcc 4.2.2-avr32-2.1.5"
+
 	config BR2_GCC_VERSION_4_2_3
-		depends on !BR2_nios2
-		depends on BR2_EXT_GCC_VERSION_4_2_3
-		depends on BR2_DEPRECATED || BR2_avr32
+		depends on !BR2_nios2 && !BR2_avr32
+		depends on BR2_DEPRECATED
 		bool "gcc 4.2.3"
 
 	config BR2_GCC_VERSION_4_2_4
@@ -54,11 +55,11 @@ choice
 	config BR2_GCC_VERSION_4_4_X
 		depends on !BR2_avr32 && !BR2_nios2
 		bool "gcc 4.4.x"
-endchoice
 
-config BR2_GCC_IS_SNAP
-	depends on !BR2_avr32
-	bool
+	config BR2_GCC_VERSION_SNAP
+		depends on !BR2_avr32 && !BR2_nios2
+		bool "gcc snapshot"
+endchoice
 
 config BR2_GCC_SUPPORTS_SYSROOT
 	bool
@@ -66,12 +67,12 @@ config BR2_GCC_SUPPORTS_SYSROOT
 
 config BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
 	bool
-	default y if !BR2_GCC_VERSION_4_1_2 && !BR2_GCC_VERSION_4_2_1 && !BR2_GCC_VERSION_4_2_2 && !BR2_GCC_VERSION_4_2_3 && !BR2_GCC_VERSION_4_2_4
+	default y if !BR2_GCC_VERSION_4_1_2 && !BR2_GCC_VERSION_4_2_1 && !BR2_GCC_VERSION_4_2_2 && !BR2_GCC_VERSION_4_2_3 && !BR2_GCC_VERSION_4_2_4 && !BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
 
 config BR2_GCC_SNAP_DATE
 	string "GCC snapshot date"
 	default "20070921"
-	depends on BR2_GCC_IS_SNAP
+	depends on BR2_GCC_VERSION_SNAP
 	help
 	  Enter snapshot date to use for gcc.  Format is:
 	  YYYYMMDD
@@ -81,12 +82,14 @@ config BR2_GCC_VERSION
 	default "4.1.2"     if BR2_GCC_VERSION_4_1_2
 	default "4.2.1"     if BR2_GCC_VERSION_4_2_1
 	default "4.2.2"     if BR2_GCC_VERSION_4_2_2
+	default "4.2.2-avr32-2.1.5" if BR2_GCC_VERSION_4_2_2_AVR32_2_1_5
 	default "4.2.3"     if BR2_GCC_VERSION_4_2_3
 	default "4.2.4"     if BR2_GCC_VERSION_4_2_4
 	default "4.3.2"     if BR2_GCC_VERSION_4_3_2
 	default "4.3.3"     if BR2_GCC_VERSION_4_3_3
 	default "4.3.4"     if BR2_GCC_VERSION_4_3_4
 	default "4.4.2"     if BR2_GCC_VERSION_4_4_X
+	default $BR2_GCC_SNAP_DATE if BR2_GCC_VERSION_SNAP
 
 config BR2_TOOLCHAIN_SYSROOT
 	bool "Enable toolchain with --sysroot support"
diff --git a/toolchain/gcc/Makefile.in b/toolchain/gcc/Makefile.in
index e92ecbc7b..c3e21cf35 100644
--- a/toolchain/gcc/Makefile.in
+++ b/toolchain/gcc/Makefile.in
@@ -8,7 +8,7 @@ GCC_VERSION:=$(call qstrip,$(BR2_GCC_VERSION))
 TARGET_OPTIMIZATION:=$(call qstrip,$(BR2_TARGET_OPTIMIZATION))
 EXTRA_GCC_CONFIG_OPTIONS:=$(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS))
 
-ifeq ($(call qstrip,$(BR2_GCC_IS_SNAP)),y)
+ifeq ($(call qstrip,$(BR2_GCC_VERSION_SNAP)),y)
 GCC_SNAP_DATE:=$(call qstrip,$(BR2_GCC_SNAP_DATE))
 else
 GCC_SNAP_DATE:=
diff --git a/toolchain/gcc/ext_source/Atmel/avr32/4.1.2-avr32-2.0/.empty b/toolchain/gcc/ext_source/Atmel/avr32/4.1.2-avr32-2.0/.empty
deleted file mode 100644
index e69de29bb..000000000
--- a/toolchain/gcc/ext_source/Atmel/avr32/4.1.2-avr32-2.0/.empty
+++ /dev/null
diff --git a/toolchain/gcc/ext_source/Atmel/avr32/4.1.2-avr32-2.2/.empty b/toolchain/gcc/ext_source/Atmel/avr32/4.1.2-avr32-2.2/.empty
deleted file mode 100644
index e69de29bb..000000000
--- a/toolchain/gcc/ext_source/Atmel/avr32/4.1.2-avr32-2.2/.empty
+++ /dev/null
diff --git a/toolchain/gcc/ext_source/Atmel/avr32/4.2.1-avr32-2.1.3/.empty b/toolchain/gcc/ext_source/Atmel/avr32/4.2.1-avr32-2.1.3/.empty
deleted file mode 100644
index e69de29bb..000000000
--- a/toolchain/gcc/ext_source/Atmel/avr32/4.2.1-avr32-2.1.3/.empty
+++ /dev/null
diff --git a/toolchain/gcc/ext_source/Atmel/avr32/4.2.2-avr32-1.1.3/.empty b/toolchain/gcc/ext_source/Atmel/avr32/4.2.2-avr32-1.1.3/.empty
deleted file mode 100644
index e69de29bb..000000000
--- a/toolchain/gcc/ext_source/Atmel/avr32/4.2.2-avr32-1.1.3/.empty
+++ /dev/null
diff --git a/toolchain/gcc/ext_source/Atmel/avr32/4.2.2-avr32-1.1.3/901-avr32-revert-broken-uclibc-stuff.patch b/toolchain/gcc/ext_source/Atmel/avr32/4.2.2-avr32-1.1.3/901-avr32-revert-broken-uclibc-stuff.patch
deleted file mode 100644
index e056be0fd..000000000
--- a/toolchain/gcc/ext_source/Atmel/avr32/4.2.2-avr32-1.1.3/901-avr32-revert-broken-uclibc-stuff.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/libstdc++-v3/acinclude.m4
-+++ b/libstdc++-v3/acinclude.m4
-@@ -125,6 +125,15 @@ AC_DEFUN([GLIBCXX_CONFIGURE], [
-   ## other macros from doing the same.  This should be automated.)  -pme
-   need_libmath=no
- 
-+  # Check for uClibc since Linux platforms use different configuration
-+  # directories depending on the C library in use.
-+  AC_EGREP_CPP([_using_uclibc], [
-+  #include <stdio.h>
-+  #if __UCLIBC__
-+    _using_uclibc
-+  #endif
-+  ], uclibc=yes, uclibc=no)
-+
-   # Find platform-specific directories containing configuration info.
-   # Also possibly modify flags used elsewhere, as needed by the platform.
-   GLIBCXX_CHECK_HOST
---- a/libstdc++-v3/config/os/gnu-linux/ctype_base.h
-+++ b/libstdc++-v3/config/os/gnu-linux/ctype_base.h
-@@ -31,8 +31,6 @@
- //
- // ISO C++ 14882: 22.1  Locales
- //
--#include <features.h>
--#include <ctype.h>
-   
- /** @file ctype_base.h
-  *  This is an internal header file, included by other library headers.
-@@ -47,11 +45,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
-   struct ctype_base
-   {
-     // Non-standard typedefs.
--#ifdef __UCLIBC__
--    typedef const __ctype_touplow_t*   __to_type;
--#else
--    typedef const int*         __to_type;
--#endif
-+    typedef const int*		__to_type;
-  
-     // NB: Offsets into ctype<char>::_M_table force a particular size
-     // on the mask type. Because of this, we don't use an enum.
diff --git a/toolchain/gcc/ext_source/Atmel/avr32/4.2.3-avr32-2.1.5/.empty b/toolchain/gcc/ext_source/Atmel/avr32/4.2.3-avr32-2.1.5/.empty
deleted file mode 100644
index e69de29bb..000000000
--- a/toolchain/gcc/ext_source/Atmel/avr32/4.2.3-avr32-2.1.5/.empty
+++ /dev/null
diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk
index e73731348..332af884a 100644
--- a/toolchain/gcc/gcc-uclibc-3.x.mk
+++ b/toolchain/gcc/gcc-uclibc-3.x.mk
@@ -17,43 +17,22 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-ifeq ($(BR2_TOOLCHAIN_SOURCE),y)
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
 
 # without sysroot support. Sysroot toolchain is gcc-uclibc-4.x.mk
 ifneq ($(BR2_TOOLCHAIN_SYSROOT),y)
 
-ifeq ($(GCC_SNAP_DATE),)
-GCC_OFFICIAL_VER:=$(GCC_VERSION)
-GCC_SITE:=$(BR2_GNU_MIRROR)/gcc/gcc-$(GCC_VERSION)
-#GCC_SITE:=ftp://ftp.ibiblio.org/pub/mirrors/gnu/ftp/gnu/gcc/gcc-$(GCC_OFFICIAL_VER)
+ifneq ($(GCC_SNAP_DATE),)
+ GCC_SITE:=ftp://sources.redhat.com/pub/gcc/snapshots/$(GCC_VERSION)
+else ifeq ($(findstring avr32,$(GCC_VERSION)),avr32)
+ GCC_SITE:=ftp://www.at91.com/pub/buildroot/
 else
-GCC_OFFICIAL_VER:=$(GCC_VERSION)-$(GCC_SNAP_DATE)
-GCC_SITE:=ftp://sources.redhat.com/pub/gcc/snapshots/$(GCC_OFFICIAL_VER)
-endif
-
-
-# redefine if using an external prepatched gcc source
-ifneq ($(BR2_TOOLCHAIN_BUILDROOT),y)
-GCC_SITE:=$(VENDOR_SITE)
-GCC_OFFICIAL_VER:=$(GCC_VERSION)$(VENDOR_SUFFIX)$(VENDOR_GCC_RELEASE)
-GCC_PATCH_DIR:=toolchain/gcc/ext_source/$(VENDOR_PATCH_DIR)/$(GCC_OFFICIAL_VERSION)
+ GCC_SITE:=$(BR2_GNU_MIRROR)/gcc/gcc-$(GCC_VERSION)
 endif
 
-GCC_SOURCE:=gcc-$(GCC_OFFICIAL_VER).tar.bz2
-GCC_DIR:=$(TOOLCHAIN_DIR)/gcc-$(GCC_OFFICIAL_VER)
-
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
-ifeq ($(GCC_SNAP_DATE),)
-GCC_PATCH_DIR:=toolchain/gcc/$(GCC_VERSION)
-else
-ifneq ($(wildcard toolchain/gcc/$(GCC_OFFICIAL_VER)),)
-GCC_PATCH_DIR:=toolchain/gcc/$(GCC_OFFICIAL_VER)
-else
+GCC_SOURCE:=gcc-$(GCC_VERSION).tar.bz2
+GCC_DIR:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)
 GCC_PATCH_DIR:=toolchain/gcc/$(GCC_VERSION)
-endif
-endif
-endif
-
 GCC_CAT:=$(BZCAT)
 GCC_STRIP_HOST_BINARIES:=true
 
@@ -142,7 +121,9 @@ $(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE)
 gcc-patched: $(GCC_DIR)/.patched
 $(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked
 	# Apply any files named gcc-*.patch from the source directory to gcc
+ifneq ($(wildcard $(GCC_PATCH_DIR)),)
 	toolchain/patch-kernel.sh $(GCC_DIR) $(GCC_PATCH_DIR) \*.patch
+endif
 	# Note: The soft float situation has improved considerably with gcc 3.4.x.
 	# We can dispense with the custom spec files, as well as libfloat for the arm case.
 	# However, we still need a patch for arm. There's a similar patch for gcc 3.3.x
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index d25a9b6d5..32f7a1e45 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -20,43 +20,22 @@
 # sysroot support works with gcc >= 4.2.0 only
 ifeq ($(BR2_TOOLCHAIN_SYSROOT),y)
 
-ifeq ($(GCC_SNAP_DATE),)
-GCC_OFFICIAL_VERSION:=$(GCC_VERSION)
-GCC_SITE:=$(BR2_GNU_MIRROR)/gcc/gcc-$(GCC_VERSION)
-#GCC_SITE:=ftp://ftp.ibiblio.org/pub/mirrors/gnu/ftp/gnu/gcc/gcc-$(GCC_OFFICIAL_VERSION)
+ifneq ($(GCC_SNAP_DATE),)
+ GCC_SITE:=ftp://sources.redhat.com/pub/gcc/snapshots/$(GCC_VERSION)
+else ifeq ($(findstring avr32,$(GCC_VERSION)),avr32)
+ GCC_SITE:=ftp://www.at91.com/pub/buildroot/
 else
-GCC_OFFICIAL_VERSION:=$(GCC_VERSION)-$(GCC_SNAP_DATE)
-GCC_SITE:=ftp://sources.redhat.com/pub/gcc/snapshots/$(GCC_OFFICIAL_VERSION)
+ GCC_SITE:=$(BR2_GNU_MIRROR)/gcc/gcc-$(GCC_VERSION)
 endif
 
-# redefine if using an external prepatched gcc source
-ifneq ($(BR2_TOOLCHAIN_BUILDROOT),y)
-GCC_SITE:=$(VENDOR_SITE)
-GCC_OFFICIAL_VERSION:=$(GCC_VERSION)$(VENDOR_SUFFIX)$(VENDOR_GCC_RELEASE)
-GCC_PATCH_DIR:=toolchain/gcc/ext_source/$(VENDOR_PATCH_DIR)/$(GCC_OFFICIAL_VERSION)
-endif #!BR2_TOOLCHAIN_BUILDROOT
-
-# define patch location
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) # Normal toolchain
-ifeq ($(GCC_SNAP_DATE),) # Not a snapshot
-GCC_PATCH_DIR:=toolchain/gcc/$(GCC_VERSION)
-else # Is a snapshot
-ifneq ($(wildcard toolchain/gcc/$(GCC_OFFICIAL_VERSION)),) # Snapshot patch?
-GCC_PATCH_DIR:=toolchain/gcc/$(GCC_OFFICIAL_VERSION)
-else # Normal patch to snapshot
-# Use the normal location, if the dedicated location does not exist
-GCC_PATCH_DIR:=toolchain/gcc/$(GCC_VERSION)
-endif # Snapshot patch
-endif # Not a snapshot
-endif # BR2_TOOLCHAIN_BUILDROOT
-
 ifneq ($(filter xtensa%,$(ARCH)),)
 include target/xtensa/patch.in
 GCC_PATCH_EXTRA:=$(call XTENSA_PATCH,gcc,$(GCC_PATCH_DIR),. ..)
 endif
 
-GCC_SOURCE:=gcc-$(GCC_OFFICIAL_VERSION).tar.bz2
-GCC_DIR:=$(TOOLCHAIN_DIR)/gcc-$(GCC_OFFICIAL_VERSION)
+GCC_SOURCE:=gcc-$(GCC_VERSION).tar.bz2
+GCC_PATCH_DIR:=toolchain/gcc/$(GCC_VERSION)
+GCC_DIR:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)
 GCC_CAT:=$(BZCAT)
 GCC_STRIP_HOST_BINARIES:=nope
 GCC_SRC_DIR:=$(GCC_DIR)
@@ -178,7 +157,9 @@ $(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE)
 gcc-patched: $(GCC_DIR)/.patched
 $(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked
 	# Apply any files named gcc-*.patch from the source directory to gcc
+ifneq ($(wildcard $(GCC_PATCH_DIR)),)
 	toolchain/patch-kernel.sh $(GCC_DIR) $(GCC_PATCH_DIR) \*.patch $(GCC_PATCH_EXTRA)
+endif
 
 	# Note: The soft float situation has improved considerably with gcc 3.4.x.
 	# We can dispense with the custom spec files, as well as libfloat for the arm case.
@@ -518,7 +499,7 @@ gcc_target-dirclean:
 	rm -rf $(GCC_BUILD_DIR3)
 
 gcc-status:
-	@echo GCC_OFFICIAL_VERSION=$(GCC_OFFICIAL_VERSION)
+	@echo GCC_VERSION=$(GCC_VERSION)
 	@echo GCC_PATCH_DIR=$(GCC_PATCH_DIR)
 	@echo GCC_SITE=$(GCC_SITE)
 
diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in
index e193fb93c..28606bab4 100644
--- a/toolchain/gdb/Config.in
+++ b/toolchain/gdb/Config.in
@@ -20,7 +20,7 @@ config BR2_PACKAGE_GDB_HOST
 choice
 	prompt "GDB debugger Version"
 	default BR2_GDB_VERSION_6_8 if !BR2_avr32
-	default BR2_GDB_VERSION_6_7_1 if BR2_avr32
+	default BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 if BR2_avr32
 	depends on BR2_PACKAGE_GDB || BR2_PACKAGE_GDB_SERVER || BR2_PACKAGE_GDB_HOST
 	help
 	  Select the version of gdb you wish to use.
@@ -41,8 +41,13 @@ choice
 		depends on BR2_DEPRECATED
 
 	config BR2_GDB_VERSION_6_7_1
+		depends on !BR2_avr32
 		bool "gdb 6.7.1"
 
+	config BR2_GDB_VERSION_6_7_1_AVR32_2_1_5
+		depends on BR2_avr32
+		bool "gdb 6.7.1-avr32-2.1.5"
+
 	config BR2_GDB_VERSION_6_8
 		bool "gdb 6.8"
 		depends on !BR2_avr32
@@ -55,4 +60,5 @@ config BR2_GDB_VERSION
 	default "6.5"      if BR2_GDB_VERSION_6_5
 	default "6.6"      if BR2_GDB_VERSION_6_6
 	default "6.7.1"    if BR2_GDB_VERSION_6_7_1
+	default "6.7.1-avr32-2.1.5" if BR2_GDB_VERSION_6_7_1_AVR32_2_1_5
 	default "6.8"      if BR2_GDB_VERSION_6_8
diff --git a/toolchain/gdb/ext_source/Atmel/avr32/6.4-avr32-2.0/.empty b/toolchain/gdb/ext_source/Atmel/avr32/6.4-avr32-2.0/.empty
deleted file mode 100644
index e69de29bb..000000000
--- a/toolchain/gdb/ext_source/Atmel/avr32/6.4-avr32-2.0/.empty
+++ /dev/null
diff --git a/toolchain/gdb/ext_source/Atmel/avr32/6.4-avr32-2.1.3/.empty b/toolchain/gdb/ext_source/Atmel/avr32/6.4-avr32-2.1.3/.empty
deleted file mode 100644
index e69de29bb..000000000
--- a/toolchain/gdb/ext_source/Atmel/avr32/6.4-avr32-2.1.3/.empty
+++ /dev/null
diff --git a/toolchain/gdb/ext_source/Atmel/avr32/6.7.1-avr32-2.1.5/.empty b/toolchain/gdb/ext_source/Atmel/avr32/6.7.1-avr32-2.1.5/.empty
deleted file mode 100644
index e69de29bb..000000000
--- a/toolchain/gdb/ext_source/Atmel/avr32/6.7.1-avr32-2.1.5/.empty
+++ /dev/null
diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk
index 4c72a21c8..bdefd099a 100644
--- a/toolchain/gdb/gdb.mk
+++ b/toolchain/gdb/gdb.mk
@@ -11,11 +11,14 @@ GDB_SOURCE:=gdb-$(GDB_OFFICIAL_VERSION).tar.bz2
 GDB_CAT:=$(BZCAT)
 
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_SOURCE),y)
-GDB_SITE:=$(VENDOR_SITE)
-GDB_PATCH_DIR:=toolchain/gdb/ext_source/$(VENDOR_PATCH_DIR)/$(GDB_OFFICIAL_VERSION)
+ GDB_SITE:=$(VENDOR_SITE)
+ GDB_PATCH_DIR:=toolchain/gdb/ext_source/$(VENDOR_PATCH_DIR)/$(GDB_OFFICIAL_VERSION)
+else ifeq ($(findstring avr32,$(GDB_VERSION)),avr32)
+ GDB_SITE:=ftp://www.at91.com/pub/buildroot/
+ GDB_PATCH_DIR:=toolchain/gdb/$(GDB_OFFICIAL_VERSION)
 else
-GDB_SITE:=$(BR2_GNU_MIRROR)/gdb
-GDB_PATCH_DIR:=toolchain/gdb/$(GDB_OFFICIAL_VERSION)
+ GDB_SITE:=$(BR2_GNU_MIRROR)/gdb
+ GDB_PATCH_DIR:=toolchain/gdb/$(GDB_OFFICIAL_VERSION)
 endif
 
 ifneq ($(filter xtensa%,$(ARCH)),)
@@ -37,7 +40,9 @@ ifeq ($(GDB_VERSION),snapshot)
 		tar jtf $(DL_DIR)/$(GDB_SOURCE) | head -1 | cut -d"/" -f1)
 	ln -sf $(TOOLCHAIN_DIR)/$(shell tar jtf $(DL_DIR)/$(GDB_SOURCE) | head -1 | cut -d"/" -f1) $(GDB_DIR)
 endif
+ifneq ($(wildcard $(GDB_PATCH_DIR)),)
 	toolchain/patch-kernel.sh $(GDB_DIR) $(GDB_PATCH_DIR) \*.patch $(GDB_PATCH_EXTRA)
+endif
 	$(CONFIG_UPDATE) $(@D)
 	touch $@
 
diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index d0486abd6..cc7dcd1a9 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -5,35 +5,40 @@ comment "uClibc Options"
 
 choice
 	prompt "uClibc C library Version"
-	default BR2_UCLIBC_VERSION_0_9_30_1
+	default BR2_UCLIBC_VERSION_0_9_30_1 if !BR2_avr32
+	default BR2_UCLIBC_VERSION_0_9_30_AVR32_2_1_5 if BR2_avr32
 	help
 	  Select the version of uClibc you wish to use.
 
 	config BR2_UCLIBC_VERSION_0_9_28_3
+		depends on !BR2_avr32
 		depends on BR2_DEPRECATED
 		bool "uClibc 0.9.28.3"
-		depends on BR2_EXT_UCLIBC_VERSION_0_9_28_3
 
 	config BR2_UCLIBC_VERSION_0_9_29
+		depends on !BR2_avr32
 		depends on BR2_DEPRECATED
 		bool "uClibc 0.9.29"
-		depends on BR2_EXT_UCLIBC_VERSION_0_9_29
 
 	config BR2_UCLIBC_VERSION_0_9_30
+		depends on !BR2_avr32
 		depends on BR2_RECENT || BR2_DEPRECATED
 		bool "uClibc 0.9.30"
-		depends on BR2_EXT_UCLIBC_VERSION_0_9_30
+
+	config BR2_UCLIBC_VERSION_0_9_30_AVR32_2_1_5
+		depends on BR2_avr32
+		bool "uClibc 0.9.30-avr32-2.1.5"
 
 	config BR2_UCLIBC_VERSION_0_9_30_1
+		depends on !BR2_avr32
 		bool "uClibc 0.9.30.1"
-		depends on BR2_EXT_UCLIBC_VERSION_0_9_30_1
 
 	config BR2_UCLIBC_VERSION_SNAPSHOT
+		depends on !BR2_avr32
 		bool "daily snapshot"
 
 endchoice
 
-
 config BR2_USE_UCLIBC_SNAPSHOT
 	string "Date (yyyymmdd) of snapshot or 'snapshot' for latest"
 	default "snapshot"
@@ -47,6 +52,7 @@ config BR2_UCLIBC_VERSION_STRING
 	default 0.9.29		if BR2_UCLIBC_VERSION_0_9_29
 	default 0.9.30		if BR2_UCLIBC_VERSION_0_9_30
 	default 0.9.30.1	if BR2_UCLIBC_VERSION_0_9_30_1
+	default 0.9.30-avr32-2.1.5 if BR2_UCLIBC_VERSION_0_9_30_AVR32_2_1_5
 	default $BR2_USE_UCLIBC_SNAPSHOT	if BR2_UCLIBC_VERSION_SNAPSHOT
 
 config BR2_UCLIBC_CONFIG
@@ -55,6 +61,7 @@ config BR2_UCLIBC_CONFIG
 	default "toolchain/uClibc/uClibc-0.9.29.config" if BR2_UCLIBC_VERSION_0_9_29
 	default "toolchain/uClibc/uClibc-0.9.30.config" if BR2_UCLIBC_VERSION_0_9_30
 	default "toolchain/uClibc/uClibc-0.9.30.config" if BR2_UCLIBC_VERSION_0_9_30_1
+	default "toolchain/uClibc/uClibc-0.9.30.config" if BR2_UCLIBC_VERSION_0_9_30_AVR32_2_1_5
 	default "toolchain/uClibc/uClibc-snapshot.config" if BR2_UCLIBC_VERSION_SNAPSHOT
 	help
 	  Some people may wish to use their own modified uClibc configuration
diff --git a/toolchain/uClibc/ext_source/Atmel/avr32/0.9.28.3-avr32-2.0/uClibc-0.9.28.3-avr32-2.0-001-libext.patch b/toolchain/uClibc/ext_source/Atmel/avr32/0.9.28.3-avr32-2.0/uClibc-0.9.28.3-avr32-2.0-001-libext.patch
deleted file mode 100644
index e1740a7ac..000000000
--- a/toolchain/uClibc/ext_source/Atmel/avr32/0.9.28.3-avr32-2.0/uClibc-0.9.28.3-avr32-2.0-001-libext.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN uClibc-0.9.28.3-0rig/Makefile uClibc-0.9.28.3/Makefile
---- uClibc-0.9.28.3-0rig/Makefile	2007-07-29 08:20:33.000000000 +0200
-+++ uClibc-0.9.28.3/Makefile	2007-08-20 07:02:53.000000000 +0200
-@@ -157,7 +157,8 @@
- install_dev:
- 	$(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)lib
- 	$(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)include
--	-$(INSTALL) -m 644 lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)lib/
-+	-$(INSTALL) -m 644 lib/*.a $(PREFIX)$(DEVEL_PREFIX)lib/
-+	-$(INSTALL) -m 644 lib/*.so* $(PREFIX)$(DEVEL_PREFIX)lib/
- 	if [ "$(KERNEL_SOURCE)" = "$(DEVEL_PREFIX)" ] ; then \
- 		extra_exclude="--exclude include/linux --exclude include/asm'*'" ; \
- 	else \
diff --git a/toolchain/uClibc/ext_source/Atmel/avr32/0.9.28.3-avr32-2.0/uClibc-0.9.28.3-avr32-2.0-002-rm-whitespace.patch b/toolchain/uClibc/ext_source/Atmel/avr32/0.9.28.3-avr32-2.0/uClibc-0.9.28.3-avr32-2.0-002-rm-whitespace.patch
deleted file mode 100644
index 2ae026588..000000000
--- a/toolchain/uClibc/ext_source/Atmel/avr32/0.9.28.3-avr32-2.0/uClibc-0.9.28.3-avr32-2.0-002-rm-whitespace.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -urN uClibc-0.9.29-0rig/include/assert.h uClibc-0.9.29/include/assert.h
---- uClibc-0.9.29-0rig/include/assert.h	2005-11-03 23:42:46.000000000 +0100
-+++ uClibc-0.9.29/include/assert.h	2007-08-13 19:10:57.000000000 +0200
-@@ -31,7 +31,7 @@
- #define	_ASSERT_H	1
- #include <features.h>
- 
--#if defined __cplusplus && __GNUC_PREREQ (2,95)
-+#if defined __cplusplus && __GNUC_PREREQ(2,95)
- # define __ASSERT_VOID_CAST static_cast<void>
- #else
- # define __ASSERT_VOID_CAST (void)
-@@ -59,13 +59,17 @@
-   (__ASSERT_VOID_CAST ((expr) ? 0 :					      \
- 		       (__assert (__STRING(expr), __FILE__, __LINE__,    \
- 				       __ASSERT_FUNCTION), 0)))
--  
-+
-+/* Define some temporaries to workaround tinyx makedepend bug */
-+#define	__GNUC_PREREQ_2_6	__GNUC_PREREQ(2, 6)
-+#define	__GNUC_PREREQ_2_4	__GNUC_PREREQ(2, 4)
- /* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__'
-    which contains the name of the function currently being defined.
-    This is broken in G++ before version 2.6.
-    C9x has a similar variable called __func__, but prefer the GCC one since
-    it demangles C++ function names.  */
--# if defined __cplusplus ? __GNUC_PREREQ (2, 6) : __GNUC_PREREQ (2, 4)
-+
-+# if defined __cplusplus ? __GNUC_PREREQ_2_6 : __GNUC_PREREQ_2_4
- #   define __ASSERT_FUNCTION	__PRETTY_FUNCTION__
- # else
- #  if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
-diff -urN uClibc-0.9.29-0rig/include/complex.h uClibc-0.9.29/include/complex.h
---- uClibc-0.9.29-0rig/include/complex.h	2002-05-09 10:15:21.000000000 +0200
-+++ uClibc-0.9.29/include/complex.h	2007-08-13 17:55:29.000000000 +0200
-@@ -33,7 +33,7 @@
- /* We might need to add support for more compilers here.  But since ISO
-    C99 is out hopefully all maintained compilers will soon provide the data
-    types `float complex' and `double complex'.  */
--#if __GNUC_PREREQ (2, 7) && !__GNUC_PREREQ (2, 97)
-+#if __GNUC_PREREQ(2, 7) && !__GNUC_PREREQ(2, 97)
- # define _Complex __complex__
- #endif
- 
-diff -urN uClibc-0.9.29-0rig/include/features.h uClibc-0.9.29/include/features.h
---- uClibc-0.9.29-0rig/include/features.h	2006-11-29 22:10:04.000000000 +0100
-+++ uClibc-0.9.29/include/features.h	2007-08-13 17:55:51.000000000 +0200
-@@ -143,7 +143,7 @@
- 
- /* Convenience macros to test the versions of glibc and gcc.
-    Use them like this:
--   #if __GNUC_PREREQ (2,8)
-+   #if __GNUC_PREREQ(2,8)
-    ... code requiring gcc 2.8 or later ...
-    #endif
-    Note - they won't work for gcc1 or glibc1, since the _MINOR macros
-@@ -366,7 +366,7 @@
- #endif	/* !ASSEMBLER */
- 
- /* Decide whether we can define 'extern inline' functions in headers.  */
--#if __GNUC_PREREQ (2, 7) && defined __OPTIMIZE__ \
-+#if __GNUC_PREREQ(2, 7) && defined __OPTIMIZE__ \
-     && !defined __OPTIMIZE_SIZE__ && !defined __NO_INLINE__
- # define __USE_EXTERN_INLINES	1
- #endif
-diff -urN uClibc-0.9.29-0rig/include/tgmath.h uClibc-0.9.29/include/tgmath.h
---- uClibc-0.9.29-0rig/include/tgmath.h	2002-05-09 10:15:21.000000000 +0200
-+++ uClibc-0.9.29/include/tgmath.h	2007-08-13 17:56:17.000000000 +0200
-@@ -34,7 +34,7 @@
-    do not try this for now and instead concentrate only on GNU CC.  Once
-    we have more information support for other compilers might follow.  */
- 
--#if __GNUC_PREREQ (2, 7)
-+#if __GNUC_PREREQ(2, 7)
- 
- # ifdef __NO_LONG_DOUBLE_MATH
- #  define __tgml(fct) fct
diff --git a/toolchain/uClibc/ext_source/Atmel/avr32/0.9.29-avr32-2.1.3/.empty b/toolchain/uClibc/ext_source/Atmel/avr32/0.9.29-avr32-2.1.3/.empty
deleted file mode 100644
index e69de29bb..000000000
--- a/toolchain/uClibc/ext_source/Atmel/avr32/0.9.29-avr32-2.1.3/.empty
+++ /dev/null
diff --git a/toolchain/uClibc/ext_source/Atmel/avr32/0.9.29-avr32-2.1.5/.empty b/toolchain/uClibc/ext_source/Atmel/avr32/0.9.29-avr32-2.1.5/.empty
deleted file mode 100644
index e69de29bb..000000000
--- a/toolchain/uClibc/ext_source/Atmel/avr32/0.9.29-avr32-2.1.5/.empty
+++ /dev/null
diff --git a/toolchain/uClibc/ext_source/Atmel/avr32/0.9.30-avr32-2.1.5/.empty b/toolchain/uClibc/ext_source/Atmel/avr32/0.9.30-avr32-2.1.5/.empty
deleted file mode 100644
index e69de29bb..000000000
--- a/toolchain/uClibc/ext_source/Atmel/avr32/0.9.30-avr32-2.1.5/.empty
+++ /dev/null
diff --git a/toolchain/uClibc/ext_source/Atmel/avr32/0.9.30-avr32-2.1.5/uClibc-0.9.30-avr32-2.1.5-unifdef-getline.patch b/toolchain/uClibc/uClibc-0.9.30-avr32-2.1.5-unifdef-getline.patch
index eb8888470..eb8888470 100644
--- a/toolchain/uClibc/ext_source/Atmel/avr32/0.9.30-avr32-2.1.5/uClibc-0.9.30-avr32-2.1.5-unifdef-getline.patch
+++ b/toolchain/uClibc/uClibc-0.9.30-avr32-2.1.5-unifdef-getline.patch
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 62fc40b26..f742d4ef4 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-ifeq ($(BR2_TOOLCHAIN_SOURCE),y)
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
 
 # specifying UCLIBC_CONFIG_FILE on the command-line overrides the .config
 # setting.
@@ -12,28 +12,19 @@ ifndef UCLIBC_CONFIG_FILE
 UCLIBC_CONFIG_FILE=$(call qstrip,$(BR2_UCLIBC_CONFIG))
 endif
 
-UCLIBC_VER:=$(call qstrip,$(BR2_UCLIBC_VERSION_STRING))
-
-UCLIBC_OFFICIAL_VERSION:=$(UCLIBC_VER)$(VENDOR_SUFFIX)$(VENDOR_UCLIBC_RELEASE)
+UCLIBC_VERSION:=$(call qstrip,$(BR2_UCLIBC_VERSION_STRING))
 
 ifeq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y)
 UCLIBC_SITE:=http://www.uclibc.org/downloads/snapshots
-UCLIBC_DIR:=$(TOOLCHAIN_DIR)/uClibc
+else ifeq ($(findstring avr32,$(UCLIBC_VERSION)),avr32)
+UCLIBC_SITE:=ftp://www.at91.com/pub/buildroot/
 else
-UCLIBC_DIR:=$(TOOLCHAIN_DIR)/uClibc-$(UCLIBC_OFFICIAL_VERSION)
 UCLIBC_SITE:=http://www.uclibc.org/downloads
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL_SOURCE),y)
-UCLIBC_SITE:=$(VENDOR_SITE)
-endif
 endif
 
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
+UCLIBC_DIR:=$(TOOLCHAIN_DIR)/uClibc-$(UCLIBC_VERSION)
 UCLIBC_PATCH_DIR:=toolchain/uClibc/
-else
-UCLIBC_PATCH_DIR:=toolchain/uClibc/ext_source/$(VENDOR_PATCH_DIR)/$(UCLIBC_OFFICIAL_VERSION)
-endif
-
-UCLIBC_SOURCE:=uClibc-$(UCLIBC_OFFICIAL_VERSION).tar.bz2
+UCLIBC_SOURCE:=uClibc-$(UCLIBC_VERSION).tar.bz2
 
 UCLIBC_CAT:=$(BZCAT)
 
@@ -103,8 +94,8 @@ uclibc-patched: $(UCLIBC_DIR)/.patched
 $(UCLIBC_DIR)/.patched: $(UCLIBC_DIR)/.unpacked
 ifneq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y)
 	toolchain/patch-kernel.sh $(UCLIBC_DIR) $(UCLIBC_PATCH_DIR) \
-		uClibc-$(UCLIBC_OFFICIAL_VERSION)-\*.patch \
-		uClibc-$(UCLIBC_OFFICIAL_VERSION)-\*.patch.$(ARCH)
+		uClibc-$(UCLIBC_VERSION)-\*.patch \
+		uClibc-$(UCLIBC_VERSION)-\*.patch.$(ARCH)
 else
 	toolchain/patch-kernel.sh $(UCLIBC_DIR) $(UCLIBC_PATCH_DIR) \
 		uClibc.\*.patch uClibc.\*.patch.$(ARCH)
@@ -257,6 +248,9 @@ else
 	/bin/echo "# CONFIG_E500 is not set" >> $(UCLIBC_DIR)/.oldconfig
 endif
 endif
+ifeq ($(UCLIBC_TARGET_ARCH),avr32)
+	/bin/echo "LINKRELAX=y" >> $(UCLIBC_DIR)/.oldconfig
+endif
 ifneq ($(UCLIBC_TARGET_ENDIAN),)
 	# The above doesn't work for me, so redo
 	$(SED) 's/.*\(ARCH_$(UCLIBC_NOT_TARGET_ENDIAN)_ENDIAN\).*/# \1 is not set/g' \