Commit f3f1a943 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

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

parents 962ea5b2 8913798b

configs/atngw100-base_defconfig

+2 −3
Original line number Diff line number Diff line
@@ -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

+2 −3
Original line number Diff line number Diff line
@@ -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

+2 −1
Original line number Diff line number Diff line
@@ -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

+2 −3
Original line number Diff line number Diff line
@@ -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

+1 −11
Original line number Diff line number Diff line
@@ -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