From 8fb846f5b5174e42b913f20ab1f058b502fd4791 Mon Sep 17 00:00:00 2001
From: Martin Lund <mgl@doredevelopment.dk>
Date: Sat, 20 Jun 2009 17:16:54 +0200
Subject: Misc AVR32 cleanups.


diff --git a/config/arch/avr32.in b/config/arch/avr32.in
index 2965828..63916da 100644
--- a/config/arch/avr32.in
+++ b/config/arch/avr32.in
@@ -4,10 +4,10 @@
 config ARCH_avr32
     select ARCH_USE_MMU
     select ARCH_DEFAULT_BE
-    help
+    select ARCH_SUPPORT_ARCH
+    select ARCH_SUPPORT_CPU
+    select ARCH_SUPPORT_TUNE
+    select ARCH_SUPPORT_FPU
+     help
       The AVR32 architecture, as defined by:
         http://www.atmel.com/products/avr32
-
-config ARCH_AVR32
-    string
-    default "avr32"
diff --git a/config/libc.in b/config/libc.in
index a10b942..d8020ca 100644
--- a/config/libc.in
+++ b/config/libc.in
@@ -2,11 +2,8 @@
 
 config LIBC
     string
-#    default "none" if BARE_METAL
-    default "newlib" if EXPERIMENTAL
-
-# FIXME: toolchain can be BARE_METAL (no OS) but have OS independent LIBC (eg. newlib)
-#        new combinations needed
+    default "none" if BARE_METAL
+    default "newlib" if BARE_METAL && ARCH_avr32 && EXPERIMENTAL
 
 menu "C-library"
 
diff --git a/config/libc/newlib.in b/config/libc/newlib.in
index fdca4ce..c4b9e08 100644
--- a/config/libc/newlib.in
+++ b/config/libc/newlib.in
@@ -40,4 +40,3 @@ config ATMEL_AVR32_HEADERS
       
       If you do native AVR32 development you want to say 'Y' here.
 
-
diff --git a/samples/avr32-unknown-none/crosstool.config b/samples/avr32-unknown-none/crosstool.config
index 2f9e8c4..f60bd73 100644
--- a/samples/avr32-unknown-none/crosstool.config
+++ b/samples/avr32-unknown-none/crosstool.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# crosstool-NG version: svn_devel_avr32@1555M
-# Sat May 23 19:57:07 2009
+# crosstool-NG version: svn_devel_avr32@1596M
+# Sat Jun 20 17:03:17 2009
 #
 
 #
@@ -77,14 +77,18 @@ CT_ARCH="avr32"
 # CT_ARCH_64 is not set
 # CT_ARCH_SUPPORTS_BOTH_MMU is not set
 # CT_ARCH_SUPPORTS_BOTH_ENDIAN is not set
-# CT_ARCH_SUPPORT_ARCH is not set
+CT_ARCH_SUPPORT_ARCH=y
 # CT_ARCH_SUPPORT_ABI is not set
-# CT_ARCH_SUPPORT_CPU is not set
-# CT_ARCH_SUPPORT_TUNE is not set
-# CT_ARCH_SUPPORT_FPU is not set
+CT_ARCH_SUPPORT_CPU=y
+CT_ARCH_SUPPORT_TUNE=y
+CT_ARCH_SUPPORT_FPU=y
 # CT_ARCH_DEFAULT_HAS_MMU is not set
 CT_ARCH_DEFAULT_BE=y
 # CT_ARCH_DEFAULT_LE is not set
+CT_ARCH_ARCH=""
+CT_ARCH_CPU=""
+CT_ARCH_TUNE=""
+CT_ARCH_FPU=""
 # CT_ARCH_FLOAT_HW is not set
 CT_ARCH_FLOAT_SW=y
 CT_TARGET_CFLAGS=""
@@ -103,7 +107,6 @@ CT_ARCH_avr32=y
 # CT_ARCH_sh is not set
 # CT_ARCH_x86_64 is not set
 # CT_ARCH_x86 is not set
-CT_ARCH_AVR32="avr32"
 CT_ARCH_USE_MMU=y
 
 #
@@ -229,7 +232,7 @@ CT_CC_SUPPORT_OBJCXX=y
 # Additional supported languages:
 #
 # CT_CC_LANG_CXX is not set
-CT_LIBC="newlib"
+CT_LIBC="none"
 
 #
 # C-library
diff --git a/scripts/build/libc/newlib.sh b/scripts/build/libc/newlib.sh
index 80dc0f4..a544693 100644
--- a/scripts/build/libc/newlib.sh
+++ b/scripts/build/libc/newlib.sh
@@ -15,8 +15,6 @@ do_libc_get() {
     if [ "${CT_ATMEL_AVR32_HEADERS}" = "y" ]; then
         CT_GetFile "avr32headers" ${avr32headers_src}
     fi
-
-    return 0
 }
 
 do_libc_extract() {
@@ -26,8 +24,6 @@ do_libc_extract() {
     if [ "${CT_ATMEL_AVR32_HEADERS}" = "y" ]; then
         CT_Extract "avr32headers"
     fi
-
-    return 0
 }
 
 do_libc_check_config() {
-- 
cgit v0.10.2-6-g49f6