Merge branch 'avr32-fixes' of git://git.busybox.net/~tpetazzoni/git/buildroot

configs/atngw100-base_defconfig

@@ -161,10 +161,9 @@ 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 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_0_9_30_1=y
 # BR2_UCLIBC_VERSION_SNAPSHOT is not set
-BR2_UCLIBC_VERSION_STRING="0.9.30-avr32-2.1.5"
+BR2_UCLIBC_VERSION_STRING="0.9.30.1"
 BR2_UCLIBC_CONFIG="toolchain/uClibc/uClibc-0.9.30.config"
 # BR2_PTHREAD_DEBUG is not set
 # BR2_PROGRAM_INVOCATION is not set

configs/atngw100_defconfig

@@ -161,10 +161,9 @@ 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 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_0_9_30_1=y
 # BR2_UCLIBC_VERSION_SNAPSHOT is not set
-BR2_UCLIBC_VERSION_STRING="0.9.30-avr32-2.1.5"
+BR2_UCLIBC_VERSION_STRING="0.9.30.1"
 BR2_UCLIBC_CONFIG="toolchain/uClibc/uClibc-0.9.30.config"
 # BR2_PTHREAD_DEBUG is not set
 # BR2_PROGRAM_INVOCATION is not set

configs/atstk1005_defconfig

@@ -169,8 +169,9 @@ 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 is not set
+BR2_UCLIBC_VERSION_0_9_30_1=y
 # BR2_UCLIBC_VERSION_SNAPSHOT is not set
-BR2_UCLIBC_VERSION_STRING="0.9.30-avr32-2.1.5"
+BR2_UCLIBC_VERSION_STRING="0.9.30.1"
 BR2_UCLIBC_CONFIG="toolchain/uClibc/uClibc-0.9.30.config"
 # BR2_PTHREAD_DEBUG is not set
 # BR2_PROGRAM_INVOCATION is not set

configs/atstk100x_defconfig

@@ -160,10 +160,9 @@ 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 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_0_9_30_1=y
 # BR2_UCLIBC_VERSION_SNAPSHOT is not set
-BR2_UCLIBC_VERSION_STRING="0.9.30-avr32-2.1.5"
+BR2_UCLIBC_VERSION_STRING="0.9.30.1"
 BR2_UCLIBC_CONFIG="toolchain/uClibc/uClibc-0.9.30.config"
 # BR2_PTHREAD_DEBUG is not set
 BR2_PROGRAM_INVOCATION=y

toolchain/uClibc/Config.in

@@ -5,8 +5,7 @@ comment "uClibc Options"
 
 choice
 	prompt "uClibc C library Version"
-	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
+	default BR2_UCLIBC_VERSION_0_9_30_1
 	help
 	  Select the version of uClibc you wish to use.
 
@@ -21,20 +20,13 @@ choice
 		bool "uClibc 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"
 
-	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"
 
 	config BR2_UCLIBC_VERSION_SNAPSHOT
-		depends on !BR2_avr32
 		bool "daily snapshot"
 
 endchoice
@@ -52,7 +44,6 @@ 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
@@ -61,7 +52,6 @@ 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

toolchain/uClibc/uClibc-0.9.30-avr32-2.1.5-unifdef-getline.patch

@@ -1,29 +0,0 @@
---- uClibc-0.9.30.1.orig/extra/scripts/unifdef.c
-+++ uClibc-0.9.30.1/extra/scripts/unifdef.c
-@@ -206,7 +206,7 @@ static void             done(void);
- static void             error(const char *);
- static int              findsym(const char *);
- static void             flushline(bool);
--static Linetype         getline(void);
-+static Linetype         get_line(void);
- static Linetype         ifeval(const char **);
- static void             ignoreoff(void);
- static void             ignoreon(void);
-@@ -512,7 +512,7 @@ process(void)
- 
- 	for (;;) {
- 		linenum++;
--		lineval = getline();
-+		lineval = get_line();
- 		trans_table[ifstate[depth]][lineval]();
- 		debug("process %s -> %s depth %d",
- 		    linetype_name[lineval],
-@@ -526,7 +526,7 @@ process(void)
-  * help from skipcomment().
-  */
- static Linetype
--getline(void)
-+get_line(void)
- {
- 	const char *cp;
- 	int cursym;

toolchain/uClibc/uclibc.mk

@@ -16,8 +16,6 @@ UCLIBC_VERSION:=$(call qstrip,$(BR2_UCLIBC_VERSION_STRING))
 
 ifeq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y)
 UCLIBC_SITE:=http://www.uclibc.org/downloads/snapshots
-else ifeq ($(findstring avr32,$(UCLIBC_VERSION)),avr32)
-UCLIBC_SITE:=ftp://www.at91.com/pub/buildroot/
 else
 UCLIBC_SITE:=http://www.uclibc.org/downloads
 endif