2010-05-10 Joel Sherrill <joel.sherrilL@OARcorp.com>

	* Makefile.am, cpu_asm.S, avr/boot.h, avr/common.h, avr/crc16.h,
	avr/delay.h, avr/eeprom.h, avr/fuse.h, avr/interrupt.h, avr/io.h,
	avr/io1200.h, avr/io2313.h, avr/io2323.h, avr/io2333.h, avr/io2343.h,
	avr/io43u32x.h, avr/io43u35x.h, avr/io4414.h, avr/io4433.h,
	avr/io4434.h, avr/io76c711.h, avr/io8515.h, avr/io8534.h,
	avr/io8535.h, avr/io86r401.h, avr/io90pwm1.h, avr/io90pwm216.h,
	avr/io90pwm2b.h, avr/io90pwm316.h, avr/io90pwm3b.h, avr/io90pwm81.h,
	avr/io90pwmx.h, avr/io90scr100.h, avr/ioa6289.h, avr/ioat94k.h,
	avr/iocan128.h, avr/iocan32.h, avr/iocan64.h, avr/iocanxx.h,
	avr/iom103.h, avr/iom128.h, avr/iom1280.h, avr/iom1281.h,
	avr/iom1284p.h, avr/iom128rfa1.h, avr/iom16.h, avr/iom161.h,
	avr/iom162.h, avr/iom163.h, avr/iom164.h, avr/iom165.h,
	avr/iom165p.h, avr/iom168.h, avr/iom168p.h, avr/iom169.h,
	avr/iom169p.h, avr/iom16hva.h, avr/iom16m1.h, avr/iom16u4.h,
	avr/iom2560.h, avr/iom2561.h, avr/iom32.h, avr/iom323.h,
	avr/iom324.h, avr/iom325.h, avr/iom3250.h, avr/iom328p.h,
	avr/iom329.h, avr/iom3290.h, avr/iom32c1.h, avr/iom32hvb.h,
	avr/iom32m1.h, avr/iom32u4.h, avr/iom32u6.h, avr/iom406.h,
	avr/iom48.h, avr/iom48p.h, avr/iom64.h, avr/iom640.h, avr/iom644.h,
	avr/iom645.h, avr/iom6450.h, avr/iom649.h, avr/iom6490.h,
	avr/iom64c1.h, avr/iom64m1.h, avr/iom8.h, avr/iom8515.h,
	avr/iom8535.h, avr/iom88.h, avr/iom88p.h, avr/iom8hva.h, avr/iomx8.h,
	avr/iomxx0_1.h, avr/iomxx4.h, avr/iomxxhva.h, avr/iotn11.h,
	avr/iotn12.h, avr/iotn13.h, avr/iotn13a.h, avr/iotn15.h,
	avr/iotn167.h, avr/iotn22.h, avr/iotn2313.h, avr/iotn24.h,
	avr/iotn25.h, avr/iotn26.h, avr/iotn261.h, avr/iotn28.h,
	avr/iotn43u.h, avr/iotn44.h, avr/iotn45.h, avr/iotn461.h,
	avr/iotn48.h, avr/iotn84.h, avr/iotn85.h, avr/iotn861.h,
	avr/iotn87.h, avr/iotn88.h, avr/iotnx4.h, avr/iotnx5.h,
	avr/iotnx61.h, avr/iousb1286.h, avr/iousb1287.h, avr/iousb162.h,
	avr/iousb646.h, avr/iousb647.h, avr/iousb82.h, avr/iousbxx2.h,
	avr/iousbxx6_7.h, avr/iox128a1.h, avr/iox128a3.h, avr/iox16a4.h,
	avr/iox16d4.h, avr/iox256a3.h, avr/iox256a3b.h, avr/iox32a4.h,
	avr/iox32d4.h, avr/iox64a1.h, avr/iox64a3.h, avr/lock.h,
	avr/parity.h, avr/pgmspace.h, avr/portpins.h, avr/power.h,
	avr/sfr_defs.h, avr/signal.h, avr/sleep.h, avr/version.h, avr/wdt.h,
	rtems/asm.h, rtems/score/cpu.h: Update to avr .h files from avr-libc
	1.6.8. Tinker with code and includes to eliminate warnings. Now
	builds multilib.
	* avr/iom169pa.h, avr/iom16a.h, avr/iom16hva2.h, avr/iom16hvb.h,
	avr/iom16u2.h, avr/iom324pa.h, avr/iom32u2.h, avr/iom644p.h,
	avr/iom644pa.h, avr/iom649p.h, avr/iom64hve.h, avr/iom88pa.h,
	avr/iom8u2.h, avr/iotn2313a.h, avr/iotn24a.h, avr/iotn261a.h,
	avr/iotn4313.h, avr/iotn44a.h, avr/iotn461a.h, avr/iotn861a.h,
	avr/iox128d3.h, avr/iox192a3.h, avr/iox192d3.h, avr/iox256d3.h,
	avr/iox64d3.h, avr/signature.h: New files.

1 files changed, 94 insertions, 0 deletions

diff --git a/cpukit/score/cpu/avr/avr/iom644p.h b/cpukit/score/cpu/avr/avr/iom644p.h
new file mode 100644
index 0000000000..8bc94b299a
--- /dev/null
+++ b/cpukit/score/cpu/avr/avr/iom644p.h
@@ -0,0 +1,94 @@
+/* Copyright (c) 2005 Anatoly Sokolov
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+
+   * Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+
+   * Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the
+     distribution.
+
+   * Neither the name of the copyright holders nor the names of
+     contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE. */
+
+/* avr/iom644p.h - definitions for ATmega644P */
+
+/* $Id$ */
+
+#ifndef _AVR_IOM644P_H_
+#define _AVR_IOM644P_H_ 1
+
+#include <avr/iomxx4.h>
+
+/* Constants */
+#define SPM_PAGESIZE 256
+#define RAMEND       0x10FF
+#define XRAMEND      RAMEND
+#define E2END        0x7FF
+#define E2PAGESIZE   8
+#define FLASHEND     0xFFFF
+
+
+/* Fuses */
+
+#define FUSE_MEMORY_SIZE 3
+
+/* Low Fuse Byte */
+#define FUSE_CKSEL0      (unsigned char)~_BV(0)
+#define FUSE_CKSEL1      (unsigned char)~_BV(1)
+#define FUSE_CKSEL2      (unsigned char)~_BV(2)
+#define FUSE_CKSEL3      (unsigned char)~_BV(3)
+#define FUSE_SUT0        (unsigned char)~_BV(4)
+#define FUSE_SUT1        (unsigned char)~_BV(5)
+#define FUSE_CKOUT       (unsigned char)~_BV(6)
+#define FUSE_CKDIV8      (unsigned char)~_BV(7)
+#define LFUSE_DEFAULT (FUSE_CKSEL0 & FUSE_CKSEL2 & FUSE_CKSEL3 & FUSE_SUT0 & FUSE_SUT1 & FUSE_CKDIV8)
+
+/* High Fuse Byte */
+#define FUSE_BOOTRST     (unsigned char)~_BV(0)
+#define FUSE_BOOTSZ0     (unsigned char)~_BV(1)
+#define FUSE_BOOTSZ1     (unsigned char)~_BV(2)
+#define FUSE_EESAVE      (unsigned char)~_BV(3)
+#define FUSE_WDTON       (unsigned char)~_BV(4)
+#define FUSE_SPIEN       (unsigned char)~_BV(5)
+#define FUSE_JTAGEN      (unsigned char)~_BV(6)
+#define FUSE_OCDEN       (unsigned char)~_BV(7)
+#define HFUSE_DEFAULT (FUSE_BOOTSZ0 & FUSE_BOOTSZ1 & FUSE_SPIEN & FUSE_JTAGEN)
+
+/* Extended Fuse Byte */
+#define FUSE_BODLEVEL0   (unsigned char)~_BV(0)
+#define FUSE_BODLEVEL1   (unsigned char)~_BV(1)
+#define FUSE_BODLEVEL2   (unsigned char)~_BV(2)
+#define EFUSE_DEFAULT (0xFF)
+
+
+/* Lock Bits */
+#define __LOCK_BITS_EXIST
+#define __BOOT_LOCK_BITS_0_EXIST
+#define __BOOT_LOCK_BITS_1_EXIST 
+
+
+/* Signature */
+#define SIGNATURE_0 0x1E
+#define SIGNATURE_1 0x96
+#define SIGNATURE_2 0x0A
+
+
+#endif /* _AVR_IOM644P_H_ */