Add support for the ATmega406 and AT90USB646/647/1286/1287 devices.

3 files changed, 20 insertions, 8 deletions

diff --git a/devel/avr-binutils/Makefile b/devel/avr-binutils/Makefile
index 3ae344e0213b..def34c261880 100644
--- a/devel/avr-binutils/Makefile
+++ b/devel/avr-binutils/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	binutils
 PORTVERSION=	2.16.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
 MASTER_SITE_SUBDIR=	binutils/releases
diff --git a/devel/avr-binutils/files/patch-newdevices b/devel/avr-binutils/files/patch-newdevices
index 54932a0580d5..ace845a178b6 100644
--- a/devel/avr-binutils/files/patch-newdevices
+++ b/devel/avr-binutils/files/patch-newdevices
@@ -1,7 +1,7 @@
 diff -ur ../binutils-2.16.1.orig/gas/config/tc-avr.c ./gas/config/tc-avr.c
 --- ../binutils-2.16.1.orig/gas/config/tc-avr.c	Wed Feb 23 13:28:04 2005
-+++ ./gas/config/tc-avr.c	Wed Jan  4 22:10:33 2006
-@@ -88,6 +88,15 @@
++++ ./gas/config/tc-avr.c	Sat Mar 18 23:45:13 2006
+@@ -88,34 +88,61 @@
    {"at86rf401", AVR_ISA_2xxx,     bfd_mach_avr2},
    {"attiny13",  AVR_ISA_TINY2,    bfd_mach_avr2},
    {"attiny2313",AVR_ISA_TINY2,    bfd_mach_avr2},
@@ -17,8 +17,15 @@ diff -ur ../binutils-2.16.1.orig/gas/config/tc-avr.c ./gas/config/tc-avr.c
    {"atmega603", AVR_ISA_M603,     bfd_mach_avr3}, /* XXX -> m103 */
    {"atmega103", AVR_ISA_M103,     bfd_mach_avr3},
    {"at43usb320",AVR_ISA_M103,     bfd_mach_avr3},
-@@ -100,21 +109,35 @@
-   {"atmega88",  AVR_ISA_M8,       bfd_mach_avr4},
+   {"at43usb355",AVR_ISA_M603,     bfd_mach_avr3},
+   {"at76c711",  AVR_ISA_M603,     bfd_mach_avr3},
+-  {"atmega48",  AVR_ISA_M8,       bfd_mach_avr4},
++  {"atmega48",  AVR_ISA_PWMx,     bfd_mach_avr4},
+   {"atmega8",   AVR_ISA_M8,       bfd_mach_avr4},
+   {"atmega83",  AVR_ISA_M8,       bfd_mach_avr4}, /* XXX -> m8535 */
+   {"atmega85",  AVR_ISA_M8,       bfd_mach_avr4}, /* XXX -> m8 */
+-  {"atmega88",  AVR_ISA_M8,       bfd_mach_avr4},
++  {"atmega88",  AVR_ISA_PWMx,     bfd_mach_avr4},
    {"atmega8515",AVR_ISA_M8,       bfd_mach_avr4},
    {"atmega8535",AVR_ISA_M8,       bfd_mach_avr4},
 +  {"at90pwm2",  AVR_ISA_PWMx,     bfd_mach_avr4},
@@ -38,6 +45,7 @@ diff -ur ../binutils-2.16.1.orig/gas/config/tc-avr.c ./gas/config/tc-avr.c
 +  {"atmega329", AVR_ISA_M323,     bfd_mach_avr5},
    {"atmega3250",AVR_ISA_M323,     bfd_mach_avr5},
 +  {"atmega3290",AVR_ISA_M323,     bfd_mach_avr5},
++  {"atmega406", AVR_ISA_M323,     bfd_mach_avr5},
    {"atmega64",  AVR_ISA_M323,     bfd_mach_avr5},
 +  {"atmega640", AVR_ISA_M323,     bfd_mach_avr5},
 +  {"atmega644", AVR_ISA_M323,     bfd_mach_avr5},
@@ -51,12 +59,15 @@ diff -ur ../binutils-2.16.1.orig/gas/config/tc-avr.c ./gas/config/tc-avr.c
 +  {"at90can32" ,AVR_ISA_M323,     bfd_mach_avr5},
 +  {"at90can64" ,AVR_ISA_M323,     bfd_mach_avr5},
    {"at90can128",AVR_ISA_M128,     bfd_mach_avr5},
++  {"at90usb647", AVR_ISA_M323,    bfd_mach_avr5},
++  {"at90usb1286",AVR_ISA_M128,    bfd_mach_avr5},
++  {"at90usb1287",AVR_ISA_M128,    bfd_mach_avr5},
    {"at94k",     AVR_ISA_94K,      bfd_mach_avr5},
    {NULL, 0, 0}
-Only in ./gas/config: tc-avr.c.orig
+ };
 diff -ur ../binutils-2.16.1.orig/include/opcode/avr.h ./include/opcode/avr.h
 --- ../binutils-2.16.1.orig/include/opcode/avr.h	Thu Mar  3 12:58:09 2005
-+++ ./include/opcode/avr.h	Wed Jan  4 22:09:48 2006
++++ ./include/opcode/avr.h	Sat Mar 18 23:41:43 2006
 @@ -37,6 +37,7 @@
                         AVR_ISA_SPM | AVR_ISA_BRK)
  #define AVR_ISA_M8   (AVR_ISA_2xxx | AVR_ISA_MUL | AVR_ISA_MOVW | \
@@ -65,4 +76,3 @@ diff -ur ../binutils-2.16.1.orig/include/opcode/avr.h ./include/opcode/avr.h
  #define AVR_ISA_M603 (AVR_ISA_2xxx | AVR_ISA_MEGA)
  #define AVR_ISA_M103 (AVR_ISA_M603 | AVR_ISA_ELPM)
  #define AVR_ISA_M161 (AVR_ISA_M603 | AVR_ISA_MUL | AVR_ISA_MOVW | \
-Only in ./include/opcode: avr.h.orig
diff --git a/devel/avr-binutils/pkg-descr b/devel/avr-binutils/pkg-descr
index 2eb951c6eb57..65eca786878f 100644
--- a/devel/avr-binutils/pkg-descr
+++ b/devel/avr-binutils/pkg-descr
@@ -16,5 +16,7 @@ following AVR devices has been added by a private patch:
   AT90PWM2/3
   ATmega164/324/644
   ATmega329/3290/649/6490
+  ATmega406
   ATmega640/1280/1281
   AT90CAN32/64
+  AT90USB646/647/1286/1287