summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Samuelsson <ulf.samuelsson@atmel.com>2007-10-13 10:15:01 +0000
committerUlf Samuelsson <ulf.samuelsson@atmel.com>2007-10-13 10:15:01 +0000
commitf53d9ece642824fb7a7c73c5d99e8c514bee15e6 (patch)
treed6f78b94afed41cc36958ef4206199c62a3a04ee
parent8e650f6ec028b3eddd8cce67843ac1ef9a058398 (diff)
Update AVR32 toolchain with new binutils and uClibc, This time it works (cross-fingers)
-rw-r--r--target/device/Atmel/uClibc.config.avr328
-rw-r--r--target/device/Config.in.toolchain68
-rw-r--r--target/linux/Config.in3
-rw-r--r--toolchain/binutils/Config.in1
-rw-r--r--toolchain/gcc/Config.in7
-rw-r--r--toolchain/kernel-headers/Config.in3
-rw-r--r--toolchain/uClibc/Config.in4
7 files changed, 76 insertions, 18 deletions
diff --git a/target/device/Atmel/uClibc.config.avr32 b/target/device/Atmel/uClibc.config.avr32
index dcc0d225e..ba8c289af 100644
--- a/target/device/Atmel/uClibc.config.avr32
+++ b/target/device/Atmel/uClibc.config.avr32
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Oct 12 09:59:26 2007
+# Sat Oct 13 09:10:03 2007
#
# TARGET_alpha is not set
# TARGET_arm is not set
@@ -71,7 +71,7 @@ LDSO_BASE_FILENAME="ld.so"
UCLIBC_CTOR_DTOR=y
# HAS_NO_THREADS is not set
UCLIBC_HAS_THREADS=y
-# PTHREADS_DEBUG_SUPPORT is not set
+PTHREADS_DEBUG_SUPPORT=y
LINUXTHREADS_OLD=y
UCLIBC_HAS_LFS=y
# MALLOC is not set
@@ -83,7 +83,7 @@ UCLIBC_DYNAMIC_ATEXIT=y
# UCLIBC_SUSV3_LEGACY is not set
# UCLIBC_SUSV3_LEGACY_MACROS is not set
UCLIBC_HAS_SHADOW=y
-UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
+# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
UCLIBC_HAS___PROGNAME=y
UNIX98PTY_ONLY=y
ASSUME_DEVPTS=y
@@ -182,7 +182,7 @@ UCLIBC_BUILD_NOEXECSTACK=y
#
# uClibc development/debugging options
#
-CROSS_COMPILER_PREFIX="/home/ulf/projects/Buildroot/20071011/buildroot/build_avr32/staging_dir/usr/bin/avr32-uclic-linux-"
+CROSS_COMPILER_PREFIX="/home/ulf/projects/Buildroot/20071013/buildroot/build_avr32/staging_dir/usr/bin/avr32-linux-uclibc-"
UCLIBC_EXTRA_CFLAGS=""
# DODEBUG is not set
# DODEBUG_PT is not set
diff --git a/target/device/Config.in.toolchain b/target/device/Config.in.toolchain
index 26b78c3af..1712d0c4b 100644
--- a/target/device/Config.in.toolchain
+++ b/target/device/Config.in.toolchain
@@ -6,18 +6,41 @@ choice
Select whether to use the toolchain built by the buildroot
system or an external pre-built toolchain.
-config BR2_TOOLCHAIN_ATMEL_AVR32
- bool "Use prepatched source for AVR32 toolchain"
+config BR2_TOOLCHAIN_ATMEL_AVR32_4_1_2
+ bool "Use prepatched source for AVR32 gcc-4.1.2 toolchain"
depends on BR2_avr32
- select BR2_GCC_VERSION_4_1_2
- select BR2_BINUTILS_VERSION_2_17
- select BR2_UCLIBC_VERSION_0_9_28_3
+ 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
+ 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
+ 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_UNKNOWNVENDOR
bool "Use prepatched source from unknown vendor"
endchoice
+config BR2_TOOLCHAIN_ATMEL_AVR32
+ bool
+ default n
+
if BR2_TOOLCHAIN_ATMEL_AVR32
config BR2_VENDOR_SITE
string
@@ -29,19 +52,20 @@ config BR2_VENDOR_SUFFIX
config BR2_VENDOR_BINUTILS_RELEASE
string
- default "-2.0" if BR2_TOOLCHAIN_ATMEL_AVR32
+ default "-2.1.3" if BR2_TOOLCHAIN_ATMEL_AVR32
config BR2_VENDOR_GCC_RELEASE
string
- default "-2.0" if BR2_TOOLCHAIN_ATMEL_AVR32
+ default "-2.0" if BR2_TOOLCHAIN_ATMEL_AVR32_4_1_2
+ default "-2.1.3" if BR2_TOOLCHAIN_ATMEL_AVR32_4_2_1
config BR2_VENDOR_UCLIBC_RELEASE
string
- default "-2.0" if BR2_TOOLCHAIN_ATMEL_AVR32
+ default "-2.1.3" if BR2_TOOLCHAIN_ATMEL_AVR32
config BR2_VENDOR_GDB_RELEASE
string
- default "-2.0" if BR2_TOOLCHAIN_ATMEL_AVR32
+ default "-2.1.3" if BR2_TOOLCHAIN_ATMEL_AVR32
config BR2_VENDOR_PATCH_DIR
string
@@ -79,3 +103,29 @@ endif
endif
+
+
+config BR2_EXT_GCC_VERSION_4_1_2
+ bool
+ default y if !BR2_TOOLCHAIN_EXTERNAL_SOURCE
+ default n if BR2_TOOLCHAIN_EXTERNAL_SOURCE
+
+config BR2_EXT_GCC_VERSION_4_2_1
+ bool
+ default y if !BR2_TOOLCHAIN_EXTERNAL_SOURCE
+ default n if BR2_TOOLCHAIN_EXTERNAL_SOURCE
+
+config BR2_EXT_BINUTILS_VERSION_2_17
+ bool
+ default y if !BR2_TOOLCHAIN_EXTERNAL_SOURCE
+ default n if BR2_TOOLCHAIN_EXTERNAL_SOURCE
+
+config BR2_EXT_UCLIBC_VERSION_0_9_29
+ bool
+ default y if !BR2_TOOLCHAIN_EXTERNAL_SOURCE
+ default n if BR2_TOOLCHAIN_EXTERNAL_SOURCE
+
+config BR2_EXT_UCLIBC_VERSION_0_9_28_3
+ bool
+ default y if !BR2_TOOLCHAIN_EXTERNAL_SOURCE
+ default n if BR2_TOOLCHAIN_EXTERNAL_SOURCE
diff --git a/target/linux/Config.in b/target/linux/Config.in
index d2baa39f0..4402381bb 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -59,7 +59,8 @@ if BR2_PACKAGE_LINUX_EXPERIMENTAL_CONFIG
choice
prompt "Linux Kernel Version"
depends on BR2_PACKAGE_LINUX
- default BR2_LINUX_2_6_22_1
+ default BR2_LINUX_2_6_22_1 if !BR2_avr32
+ default BR2_LINUX_2_6_22_10 if BR2_avr32
help
Select the specific Linux version you want to use
diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index fa661ed1e..1f92eafef 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -10,6 +10,7 @@ choice
config BR2_BINUTILS_VERSION_2_17
depends BR2_avr32 || !BR2_nios2 && BR2_DEPRECATED
+ depends BR2_EXT_BINUTILS_VERSION_2_17
bool "binutils 2.17"
config BR2_BINUTILS_VERSION_2_17_50_0_17
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 9d844396c..20b8b0312 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -4,7 +4,8 @@ comment "GCC Options"
choice
prompt "GCC compiler Version"
- default BR2_GCC_VERSION_4_2_1
+ default BR2_GCC_VERSION_4_2_1 if !BR2_avr32
+ default BR2_GCC_VERSION_4_1_2 if BR2_avr32
help
Select the version of gcc you wish to use.
@@ -19,6 +20,7 @@ choice
config BR2_GCC_VERSION_4_1_2
depends !BR2_nios2
+ depends BR2_EXT_GCC_VERSION_4_1_2
bool "gcc 4.1.2"
config BR2_GCC_VERSION_4_2_0
@@ -27,7 +29,8 @@ choice
bool "gcc 4.2.0"
config BR2_GCC_VERSION_4_2_1
- depends !BR2_avr32 && !BR2_nios2
+ depends !BR2_nios2
+ depends BR2_EXT_GCC_VERSION_4_2_1
bool "gcc 4.2.1"
# config BR2_GCC_VERSION_4_3
diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index b656cc691..211d89a82 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -62,7 +62,7 @@ choice
bool "Latest Linux 2.6.21.x kernel headers"
config BR2_KERNEL_HEADERS_2_6_22_1
- depends !BR2_nios2
+ depends !BR2_avr32 && !BR2_nios2
bool "Linux 2.6.22.1 kernel headers"
config BR2_KERNEL_HEADERS_2_6_22_10
@@ -79,6 +79,7 @@ choice
config BR2_KERNEL_HEADERS_SNAP
bool "Linux 2.6 snapshot"
+ depends !BR2_avr32
endchoice
diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 386f8c9a4..b463f2bd0 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -10,11 +10,13 @@ choice
Select the version of uClibc you wish to use.
config BR2_UCLIBC_VERSION_0_9_28_3
- depends BR2_avr32 || BR2_DEPRECATED
+ depends !BR2_avr32 && BR2_DEPRECATED
bool "uClibc 0.9.28.3"
+ depends BR2_EXT_UCLIBC_VERSION_0_9_28_3
config BR2_UCLIBC_VERSION_0_9_29
bool "uClibc 0.9.29"
+ depends BR2_EXT_UCLIBC_VERSION_0_9_29
config BR2_UCLIBC_VERSION_SNAPSHOT
depends !BR2_avr32