[avr-libc-commit] [2171] 2010-06-15 Eric B.

[Eric Weddington]

Revision: 2171
          http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2171
Author:   arcanum
Date:     2010-06-15 14:26:56 +0000 (Tue, 15 Jun 2010)
Log Message:
-----------
2010-06-15  Eric B. Weddington  <address@hidden>

        * configure.ac: Change ATxemga32A4 from avrxmega3 to avrxmega2.
        * devtools/gen-avr-lib-tree.sh: Same.
        * doc/api/using-tools.dox: Same.

Modified Paths:
--------------
    trunk/avr-libc/ChangeLog
    trunk/avr-libc/configure.ac
    trunk/avr-libc/devtools/gen-avr-lib-tree.sh
    trunk/avr-libc/doc/api/using-tools.dox

Modified: trunk/avr-libc/ChangeLog
===================================================================
--- trunk/avr-libc/ChangeLog    2010-06-14 08:04:47 UTC (rev 2170)
+++ trunk/avr-libc/ChangeLog    2010-06-15 14:26:56 UTC (rev 2171)
@@ -1,3 +1,9 @@
+2010-06-15  Eric B. Weddington  <address@hidden>
+
+       * configure.ac: Change ATxemga32A4 from avrxmega3 to avrxmega2.
+       * devtools/gen-avr-lib-tree.sh: Same.
+       * doc/api/using-tools.dox: Same.
+
 2010-06-14  Eric B. Weddington  <address@hidden>
 
        * LICENSE: Update copyright year.

Modified: trunk/avr-libc/configure.ac
===================================================================
--- trunk/avr-libc/configure.ac 2010-06-14 08:04:47 UTC (rev 2170)
+++ trunk/avr-libc/configure.ac 2010-06-15 14:26:56 UTC (rev 2171)
@@ -896,24 +896,19 @@
 CHECK_AVR_DEVICE(avrxmega2)
 AM_CONDITIONAL(HAS_avrxmega2, test "x$HAS_avrxmega2" = "xyes")
 
-CHECK_AVR_DEVICE(atxmega32d4)
-AM_CONDITIONAL(HAS_atxmega32d4, test "x$HAS_atxmega32d4" = "xyes")
-
 CHECK_AVR_DEVICE(atxmega16a4)
 AM_CONDITIONAL(HAS_atxmega16a4, test "x$HAS_atxmega16a4" = "xyes")
 
 CHECK_AVR_DEVICE(atxmega16d4)
 AM_CONDITIONAL(HAS_atxmega16d4, test "x$HAS_atxmega16d4" = "xyes")
 
-
-# avrxmega3
-CHECK_AVR_DEVICE(avrxmega3)
-AM_CONDITIONAL(HAS_avrxmega3, test "x$HAS_avrxmega3" = "xyes")
-
 CHECK_AVR_DEVICE(atxmega32a4)
 AM_CONDITIONAL(HAS_atxmega32a4, test "x$HAS_atxmega32a4" = "xyes")
 
+CHECK_AVR_DEVICE(atxmega32d4)
+AM_CONDITIONAL(HAS_atxmega32d4, test "x$HAS_atxmega32d4" = "xyes")
 
+
 # avrxmega4
 CHECK_AVR_DEVICE(avrxmega4)
 AM_CONDITIONAL(HAS_avrxmega4, test "x$HAS_avrxmega4" = "xyes")
@@ -1258,17 +1253,12 @@
 # avrxmega2
 AC_CONFIG_FILES([
        avr/lib/avrxmega2/Makefile
-       avr/lib/avrxmega2/atxmega32d4/Makefile
        avr/lib/avrxmega2/atxmega16a4/Makefile
        avr/lib/avrxmega2/atxmega16d4/Makefile
+       avr/lib/avrxmega2/atxmega32a4/Makefile
+       avr/lib/avrxmega2/atxmega32d4/Makefile
 ])
 
-# avrxmega3
-AC_CONFIG_FILES([
-       avr/lib/avrxmega3/Makefile
-       avr/lib/avrxmega3/atxmega32a4/Makefile
-])
-
 # avrxmega4
 AC_CONFIG_FILES([
        avr/lib/avrxmega4/Makefile

Modified: trunk/avr-libc/devtools/gen-avr-lib-tree.sh
===================================================================
--- trunk/avr-libc/devtools/gen-avr-lib-tree.sh 2010-06-14 08:04:47 UTC (rev 
2170)
+++ trunk/avr-libc/devtools/gen-avr-lib-tree.sh 2010-06-15 14:26:56 UTC (rev 
2171)
@@ -259,15 +259,12 @@
 "
 
 AVRXMEGA2_DEV_INFO="\
-atxmega32d4:crtx32d4.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\
 atxmega16a4:crtx16a4.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\
-atxmega16d4:crtx16d4.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS}\
+atxmega16d4:crtx16d4.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\
+atxmega32a4:crtx32a4.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\
+atxmega32d4:crtx32d4.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS}\
 "
 
-AVRXMEGA3_DEV_INFO="\
-atxmega32a4:crtx32a4.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS}\
-"
-
 AVRXMEGA4_DEV_INFO="\
 atxmega64a3:crtx64a3.o:${DEV_DEFS}:${CFLAGS_BIG_MEMORY}:${DEV_ASFLAGS};\
 atxmega64d3:crtx64d3.o:${DEV_DEFS}:${CFLAGS_BIG_MEMORY}:${DEV_ASFLAGS}\

Modified: trunk/avr-libc/doc/api/using-tools.dox
===================================================================
--- trunk/avr-libc/doc/api/using-tools.dox      2010-06-14 08:04:47 UTC (rev 
2170)
+++ trunk/avr-libc/doc/api/using-tools.dox      2010-06-15 14:26:56 UTC (rev 
2171)
@@ -380,10 +380,9 @@
 
   <tr><td>avrxmega2</td><td>atxmega16a4</td><td>__AVR_ATxmega16A4__</td></tr>
   <tr><td>avrxmega2</td><td>atxmega16d4</td><td>__AVR_ATxmega16D4__</td></tr>
+  <tr><td>avrxmega2</td><td>atxmega32a4</td><td>__AVR_ATxmega32A4__</td></tr>
   <tr><td>avrxmega2</td><td>atxmega32d4</td><td>__AVR_ATxmega32D4__</td></tr>
 
-  <tr><td>avrxmega3</td><td>atxmega32a4</td><td>__AVR_ATxmega32A4__</td></tr>
-
   <tr><td>avrxmega4</td><td>atxmega64a3</td><td>__AVR_ATxmega64A3__</td></tr>
   <tr><td>avrxmega4</td><td>atxmega64d3</td><td>__AVR_ATxmega64D3__</td></tr>