Mercurial > ecos

changeset 2572:df58e3d624bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/at91_flash.c (flash_hwr_init): Add support for AT91SAM7XC.
author asl
date Sun, 19 Oct 2008 15:10:58 +0000
parents 6bacaacdf8e9
children 6753c2347f3b
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 @@
+2008-10-19  Oliver Munz <munz@speag.ch>
+
+	* src/at91_flash.c (flash_hwr_init): Add support for AT91SAM7XC.
+
 2006-05-23  Andrew Lunn  <andrew.lunn@ascom.ch>
 
 	* src/at91_flash.c: Support for the AT91SAM7X devices.
--- a/packages/devs/flash/arm/at91/current/src/at91_flash.c
+++ b/packages/devs/flash/arm/at91/current/src/at91_flash.c
@@ -211,7 +211,8 @@ flash_hwr_init(void){
     goto out;
 
   if (((chipID1r & AT91_DBG_C1R_ARCH_MASK) != AT91_DBG_C1R_ARCH_AT91SAM7Sxx) &&
-      ((chipID1r & AT91_DBG_C1R_ARCH_MASK) != AT91_DBG_C1R_ARCH_AT91SAM7Xxx))
+      ((chipID1r & AT91_DBG_C1R_ARCH_MASK) != AT91_DBG_C1R_ARCH_AT91SAM7Xxx) &&
+      ((chipID1r & AT91_DBG_C1R_ARCH_MASK) != AT91_DBG_C1R_ARCH_AT91SAM7XC))
     goto out;
   
   if ((chipID1r & AT91_DBG_C1R_FLASH_MASK) == AT91_DBG_C1R_FLASH_0K)