* gas/config/tc-avr.c (mcu_types): Add ATmega64RFR2,

	ATmega644RFR2, ATmega128RFR2, ATmega1284RFR2, ATmega256RFR2,
	ATmega2564RFR2
	* gas/doc/c-avr.texi (-mmcu documentation): Likewise.

3 files changed, 34 insertions, 17 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 5918b60..37954ea 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2013-04-09 Joerg Wunsch <joerg.wunsch@atmel.com>
+
+	* gas/config/tc-avr.c (mcu_types): Add ATmega64RFR2,
+	ATmega644RFR2, ATmega128RFR2, ATmega1284RFR2, ATmega256RFR2,
+	ATmega2564RFR2
+	* gas/doc/c-avr.texi (-mmcu documentation): Likewise.
+
 2013-04-09  Jan Beulich <jbeulich@suse.com>
 
 	* gas/config/tc-arm.c (do_vmrs): Accept all control registers.
diff --git a/gas/config/tc-avr.c b/gas/config/tc-avr.c
index e477417..a673fe1 100644
--- a/gas/config/tc-avr.c
+++ b/gas/config/tc-avr.c
@@ -218,6 +218,8 @@ static struct mcu_type_s mcu_types[] =
   {"atmega6490", AVR_ISA_AVR5,    bfd_mach_avr5},
   {"atmega6490a",AVR_ISA_AVR5,    bfd_mach_avr5},
   {"atmega6490p",AVR_ISA_AVR5,    bfd_mach_avr5},
+  {"atmega64rfr2",AVR_ISA_AVR5,   bfd_mach_avr5},
+  {"atmega644rfr2",AVR_ISA_AVR5,  bfd_mach_avr5},
   {"atmega16hva",AVR_ISA_AVR5,    bfd_mach_avr5},
   {"atmega16hva2",AVR_ISA_AVR5,    bfd_mach_avr5},
   {"atmega16hvb",AVR_ISA_AVR5,    bfd_mach_avr5},
@@ -248,11 +250,15 @@ static struct mcu_type_s mcu_types[] =
   {"atmega1281", AVR_ISA_AVR51,   bfd_mach_avr51},
   {"atmega1284p",AVR_ISA_AVR51,   bfd_mach_avr51},
   {"atmega128rfa1",AVR_ISA_AVR51, bfd_mach_avr51},
+  {"atmega128rfr2",AVR_ISA_AVR51, bfd_mach_avr51},
+  {"atmega1284rfr2",AVR_ISA_AVR51, bfd_mach_avr51},
   {"at90can128", AVR_ISA_AVR51,   bfd_mach_avr51},
   {"at90usb1286",AVR_ISA_AVR51,   bfd_mach_avr51},
   {"at90usb1287",AVR_ISA_AVR51,   bfd_mach_avr51},
   {"atmega2560", AVR_ISA_AVR6,    bfd_mach_avr6},
   {"atmega2561", AVR_ISA_AVR6,    bfd_mach_avr6},
+  {"atmega256rfr2", AVR_ISA_AVR6, bfd_mach_avr6},
+  {"atmega2564rfr2", AVR_ISA_AVR6, bfd_mach_avr6},
   {"atxmega16a4", AVR_ISA_XMEGA,  bfd_mach_avrxmega2},
   {"atxmega16d4", AVR_ISA_XMEGA,  bfd_mach_avrxmega2},
   {"atxmega16x1", AVR_ISA_XMEGA,  bfd_mach_avrxmega2},
diff --git a/gas/doc/c-avr.texi b/gas/doc/c-avr.texi
index b5a44eb..8ef9aac 100644
--- a/gas/doc/c-avr.texi
+++ b/gas/doc/c-avr.texi
@@ -1,5 +1,4 @@
-@c Copyright 2006, 2007, 2008, 2009, 2011
-@c Free Software Foundation, Inc.
+@c Copyright 2006-2013 Free Software Foundation, Inc.
 @c This is part of the GAS manual.
 @c For copying conditions, see the file as.texinfo.
 
@@ -64,27 +63,32 @@ atmega88a, atmega88p, atmega88pa, atmega8515, atmega8535, atmega8hva, at90pwm1,
 at90pwm2, at90pwm2b, at90pwm3, at90pwm3b, at90pwm81).
 
 Instruction set avr5 is for the enhanced AVR core with up to 128K program
-memory space (MCU types: atmega16, atmega16a, atmega161, atmega162, atmega163,
-atmega164a, atmega164p, atmega165, atmega165a, atmega165p, atmega168,
-atmega168a, atmega168p, atmega169, atmega169a, atmega169p, atmega169pa,
-atmega32, atmega323, atmega324a, atmega324p, atmega325, atmega325a, atmega325p,
-atmega325pa, atmega3250, atmega3250a, atmega3250p, atmega3250pa, atmega328,
-atmega328p, atmega329, atmega329a, atmega329p, atmega329pa, atmega3290,
-atmega3290a, atmega3290p, atmega3290pa, atmega406, atmega64, atmega640,
-atmega644, atmega644a, atmega644p, atmega644pa, atmega645, atmega645a,
-atmega645p, atmega6450, atmega6450a, atmega6450p, atmega649, atmega649a,
-atmega649p, atmega6490, atmega6490a, atmega6490p, atmega16hva, atmega16hva2,
-atmega16hvb, atmega16hvbrevb, atmega32hvb, atmega32hvbrevb, atmega64hve,
-at90can32, at90can64, at90pwm161, at90pwm216, at90pwm316, atmega32c1,
-atmega64c1, atmega16m1, atmega32m1, atmega64m1, atmega16u4, atmega32u4,
+memory space (MCU types: atmega16, atmega16a, atmega161, atmega162,
+atmega163, atmega164a, atmega164p, atmega165, atmega165a, atmega165p,
+atmega168, atmega168a, atmega168p, atmega169, atmega169a, atmega169p,
+atmega169pa, atmega32, atmega323, atmega324a, atmega324p, atmega325,
+atmega325a, atmega325p, atmega325pa, atmega3250, atmega3250a,
+atmega3250p, atmega3250pa, atmega328, atmega328p, atmega329,
+atmega329a, atmega329p, atmega329pa, atmega3290, atmega3290a,
+atmega3290p, atmega3290pa, atmega406, atmega64, atmega640, atmega644,
+atmega644a, atmega644p, atmega644pa, atmega645, atmega645a,
+atmega645p, atmega6450, atmega6450a, atmega6450p, atmega649,
+atmega649a, atmega649p, atmega6490, atmega6490a, atmega6490p,
+atmega64rfr2, atmega644rfr2, atmega16hva, atmega16hva2, atmega16hvb,
+atmega16hvbrevb, atmega32hvb, atmega32hvbrevb, atmega64hve, at90can32,
+at90can64, at90pwm161, at90pwm216, at90pwm316, atmega32c1, atmega64c1,
+atmega16m1, atmega32m1, atmega64m1, atmega16u4, atmega32u4,
 atmega32u6, at90usb646, at90usb647, at94k, at90scr100).
 
 Instruction set avr51 is for the enhanced AVR core with exactly 128K program
 memory space (MCU types: atmega128, atmega1280, atmega1281, atmega1284p,
-atmega128rfa1, at90can128, at90usb1286, at90usb1287, m3000).
+atmega128rfa1,
+atmega128rfr2, atmega1284rfr2,
+at90can128, at90usb1286, at90usb1287, m3000).
 
 Instruction set avr6 is for the enhanced AVR core with a 3-byte PC (MCU types:
-atmega2560, atmega2561).
+atmega2560, atmega2561,
+atmega256rfr2, atmega2564rfr2).
 
 Instruction set avrxmega2 is for the XMEGA AVR core with 8K to 64K program
 memory space and less than 64K data space (MCU types: atxmega16a4, atxmega16d4,