Mercurial > nand-ecoscentric

changeset 2224:de2bef46557a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/at91_flash.c: Support for the AT91SAM7X devices.
author asl
date Fri, 02 Jun 2006 18:50:34 +0000
parents 41234426f916
children 26500399b500
files packages/devs/flash/arm/at91/current/ChangeLog packages/devs/flash/arm/at91/current/src/at91_flash.c
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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)