# HG changeset patch
# User asl
# Date 1149274234 0
# Node ID de2bef46557a262187076376733fdee60bd8efb4
# Parent  41234426f916e671be3e957b54d1e53c26b748e3
        * src/at91_flash.c: Support for the AT91SAM7X devices.

diff --git a/packages/devs/flash/arm/at91/current/ChangeLog b/packages/devs/flash/arm/at91/current/ChangeLog
--- a/packages/devs/flash/arm/at91/current/ChangeLog
+++ b/packages/devs/flash/arm/at91/current/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-23  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* src/at91_flash.c: Support for the AT91SAM7X devices.
+
 2006-02-19  Oliver Munz <munz@speag.ch>
 	
 	* src/at91_flash.c: Optimize the cyg_uint32 page.
diff --git a/packages/devs/flash/arm/at91/current/src/at91_flash.c b/packages/devs/flash/arm/at91/current/src/at91_flash.c
--- a/packages/devs/flash/arm/at91/current/src/at91_flash.c
+++ b/packages/devs/flash/arm/at91/current/src/at91_flash.c
@@ -210,7 +210,8 @@ flash_hwr_init(void){
   if ((chipID1r & AT91_DBG_C1R_CPU_MASK) != AT91_DBG_C1R_ARM7TDMI)
     goto out;
 
-  if ((chipID1r & AT91_DBG_C1R_ARCH_MASK) != AT91_DBG_C1R_ARCH_AT91SAM7Sxx)
+  if (((chipID1r & AT91_DBG_C1R_ARCH_MASK) != AT91_DBG_C1R_ARCH_AT91SAM7Sxx) &&
+      ((chipID1r & AT91_DBG_C1R_ARCH_MASK) != AT91_DBG_C1R_ARCH_AT91SAM7Xxx))
     goto out;
   
   if ((chipID1r & AT91_DBG_C1R_FLASH_MASK) == AT91_DBG_C1R_FLASH_0K)