- reformat src/jtag/bitq.c (thanks to Pavel Chromy)
[fw/openocd] / src / flash / at91sam7.c
index 348a8652d6824ac4dfab0d3f6a2661902e493d07..0d97c34cb5d8454a2891b04f6cf51a85c8ce76b0 100644 (file)
@@ -33,6 +33,11 @@ There are some things to notice
 * Lock regions (sectors) are 32 or 64 pages
 *
  ***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "replacements.h"
 
 #include "at91sam7.h"
 
@@ -58,8 +63,8 @@ int at91sam7_info(struct flash_bank_s *bank, char *buf, int buf_size);
 
 u32 at91sam7_get_flash_status(flash_bank_t *bank);
 void at91sam7_set_flash_mode(flash_bank_t *bank,int mode);
-u8 at91sam7_wait_status_busy(flash_bank_t *bank, int timeout);
-int at91sam7_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+u32 at91sam7_wait_status_busy(flash_bank_t *bank, u32 waitbits, int timeout);
+int at91sam7_handle_gpnvm_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 
 flash_driver_t at91sam7_flash =
 {
@@ -115,44 +120,131 @@ long SRAMSIZ[16] = {
    0x80000, /* 512K */
 };
 
+int at91sam7_register_commands(struct command_context_s *cmd_ctx)
+{
+       command_t *at91sam7_cmd = register_command(cmd_ctx, NULL, "at91sam7", NULL, COMMAND_ANY, NULL);
+       register_command(cmd_ctx, at91sam7_cmd, "gpnvm", at91sam7_handle_gpnvm_command, COMMAND_EXEC,
+                       "at91sam7 gpnvm <num> <bit> set|clear, set or clear at91sam7 gpnvm bit");
+
+       return ERROR_OK;
+}
+
 u32 at91sam7_get_flash_status(flash_bank_t *bank)
 {
        at91sam7_flash_bank_t *at91sam7_info = bank->driver_priv;
        target_t *target = at91sam7_info->target;
-       long fsr;
+       u32 fsr;
        
-       target->type->read_memory(target, MC_FSR, 4, 1, (u8 *)&fsr);
+       target_read_u32(target, MC_FSR, &fsr);
        
        return fsr;
 }
 
+/** Read clock configuration and set at91sam7_info->usec_clocks*/ 
+void at91sam7_read_clock_info(flash_bank_t *bank)
+{
+       at91sam7_flash_bank_t *at91sam7_info = bank->driver_priv;
+       target_t *target = at91sam7_info->target;
+       u32 mckr, mcfr, pllr;
+       unsigned long tmp = 0, mainfreq;
+
+       /* Read main clock freqency register */
+       target_read_u32(target, CKGR_MCFR, &mcfr);
+       /* Read master clock register */
+       target_read_u32(target, PMC_MCKR, &mckr);
+       /* Read Clock Generator PLL Register  */
+       target_read_u32(target, CKGR_PLLR, &pllr);
+
+       at91sam7_info->mck_valid = 0;
+       switch (mckr & PMC_MCKR_CSS) {
+       case 0:                 /* Slow Clock */
+               at91sam7_info->mck_valid = 1;
+               tmp = RC_FREQ;
+               break;
+       case 1:                 /* Main Clock */
+               if (mcfr & CKGR_MCFR_MAINRDY) 
+               {
+                       at91sam7_info->mck_valid = 1;
+                       mainfreq = RC_FREQ / 16ul * (mcfr & 0xffff);
+                       tmp = mainfreq;
+               }
+               break;
+                 
+       case 2:                 /* Reserved */
+               break;
+       case 3:         /* PLL Clock */
+               if (mcfr & CKGR_MCFR_MAINRDY) 
+               {
+                       target_read_u32(target, CKGR_PLLR, &pllr);
+                       if (!(pllr & CKGR_PLLR_DIV))
+                               break; /* 0 Hz */
+                       at91sam7_info->mck_valid = 1;
+                       mainfreq = RC_FREQ / 16ul * (mcfr & 0xffff);
+                       /* Integer arithmetic should have sufficient precision
+                          as long as PLL is properly configured. */
+                       tmp = mainfreq / (pllr & CKGR_PLLR_DIV) *
+                         (((pllr & CKGR_PLLR_MUL) >> 16) + 1);
+               }
+               break;
+       }
+       
+       /* Prescaler adjust */
+       if (((mckr & PMC_MCKR_PRES) >> 2) == 7)
+               at91sam7_info->mck_valid = 0;
+       else
+               at91sam7_info->mck_freq = tmp >> ((mckr & PMC_MCKR_PRES) >> 2);
+
+       /* Forget old flash timing */
+       at91sam7_set_flash_mode(bank,FMR_TIMING_NONE);
+}
+
 /* Setup the timimg registers for nvbits or normal flash */
 void at91sam7_set_flash_mode(flash_bank_t *bank,int mode)
 {
-       u32 fmcn, fmr;
+       u32 fmr, fmcn = 0, fws = 0;
        at91sam7_flash_bank_t *at91sam7_info = bank->driver_priv;
        target_t *target = at91sam7_info->target;
        
-       if (mode != at91sam7_info->flashmode) {
-               /* mainf contains the number of main clocks in approx 500uS */
-               if (mode==1)
-                       /* main clocks in 1uS */
-                       fmcn = (at91sam7_info->mainf>>9)+1;
-               else
+       if (mode && (mode != at91sam7_info->flashmode))
+       {
+               /* Always round up (ceil) */
+              if (mode==FMR_TIMING_NVBITS)
+              {
+                     if (at91sam7_info->cidr_arch == 0x60)
+                     {                           
+                            /* AT91SAM7A3 uses master clocks in 100 ns */
+                            fmcn = (at91sam7_info->mck_freq/10000000ul)+1;
+                     }
+                     else
+                     {
+                            /* master clocks in 1uS for ARCH 0x7 types */
+                            fmcn = (at91sam7_info->mck_freq/1000000ul)+1;
+                     }
+              }
+              else if (mode==FMR_TIMING_FLASH)
                        /* main clocks in 1.5uS */
-                       fmcn = (at91sam7_info->mainf>>9)+(at91sam7_info->mainf>>10)+1;
+                       fmcn = (at91sam7_info->mck_freq/666666ul)+1;
+
+               /* Only allow fmcn=0 if clock period is > 30 us = 33kHz. */
+               if (at91sam7_info->mck_freq <= 33333ul)
+                       fmcn = 0;
+               /* Only allow fws=0 if clock frequency is < 30 MHz. */
+               if (at91sam7_info->mck_freq > 30000000ul)
+                       fws = 1;
+
                DEBUG("fmcn: %i", fmcn); 
-               fmr = fmcn<<16;
-               target->type->write_memory(target, MC_FSR, 4, 1, (u8 *)&fmr);
-               at91sam7_info->flashmode = mode;                
+               fmr = fmcn << 16 | fws << 8;
+               target_write_u32(target, MC_FMR, fmr);
        }
+       
+       at91sam7_info->flashmode = mode;                
 }
 
-u8 at91sam7_wait_status_busy(flash_bank_t *bank, int timeout)
+u32 at91sam7_wait_status_busy(flash_bank_t *bank, u32 waitbits, int timeout)
 {
        u32 status;
        
-       while ((!((status = at91sam7_get_flash_status(bank)) & 0x01)) && (timeout-- > 0))
+       while ((!((status = at91sam7_get_flash_status(bank)) & waitbits)) && (timeout-- > 0))
        {
                DEBUG("status: 0x%x", status);
                usleep(1000);
@@ -160,7 +252,7 @@ u8 at91sam7_wait_status_busy(flash_bank_t *bank, int timeout)
        
        DEBUG("status: 0x%x", status);
 
-       if (status&0x0C)
+       if (status & 0x0C)
        {
                ERROR("status register: 0x%x", status);
                if (status & 0x4)
@@ -174,6 +266,8 @@ u8 at91sam7_wait_status_busy(flash_bank_t *bank, int timeout)
        return status;
 }
 
+
+/* Send one command to the AT91SAM flash controller */
 int at91sam7_flash_command(struct flash_bank_s *bank,u8 cmd,u16 pagen) 
 {
        u32 fcr;
@@ -181,11 +275,21 @@ int at91sam7_flash_command(struct flash_bank_s *bank,u8 cmd,u16 pagen)
        target_t *target = at91sam7_info->target;
 
        fcr = (0x5A<<24) | (pagen<<8) | cmd; 
-       target->type->write_memory(target, MC_FCR, 4, 1, (u8 *)&fcr);
-       DEBUG("Flash command: 0x%x, pagenumber:", fcr, pagen);
+       target_write_u32(target, MC_FCR, fcr);
+       DEBUG("Flash command: 0x%x, pagenumber:%u", fcr, pagen);
 
-       if (at91sam7_wait_status_busy(bank, 10)&0x0C) 
+       if ((at91sam7_info->cidr_arch == 0x60)&&((cmd==SLB)|(cmd==CLB)))
        {
+              /* Lock bit manipulation on AT91SAM7A3 waits for FC_FSR bit 1, EOL */
+              if (at91sam7_wait_status_busy(bank, MC_FSR_EOL, 10)&0x0C) 
+              {
+                     return ERROR_FLASH_OPERATION_FAILED;
+              }
+              return ERROR_OK;
+       }
+
+       if (at91sam7_wait_status_busy(bank, MC_FSR_FRDY, 10)&0x0C) 
+       {
                return ERROR_FLASH_OPERATION_FAILED;
        }               
        return ERROR_OK;
@@ -196,7 +300,7 @@ int at91sam7_read_part_info(struct flash_bank_s *bank)
 {
        at91sam7_flash_bank_t *at91sam7_info = bank->driver_priv;
        target_t *target = at91sam7_info->target;
-       unsigned long cidr, mcfr, status;
+       u32 cidr, status;
        
        if (at91sam7_info->target->state != TARGET_HALTED)
        {
@@ -204,7 +308,7 @@ int at91sam7_read_part_info(struct flash_bank_s *bank)
        }
        
        /* Read and parse chip identification register */
-       target->type->read_memory(target, DBGU_CIDR, 4, 1, (u8 *)&cidr);
+       target_read_u32(target, DBGU_CIDR, &cidr);
        
        if (cidr == 0)
        {
@@ -222,23 +326,12 @@ int at91sam7_read_part_info(struct flash_bank_s *bank)
        at91sam7_info->cidr_eproc = (cidr>>5)&0x0007;
        at91sam7_info->cidr_version = cidr&0x001F;
        bank->size = NVPSIZ[at91sam7_info->cidr_nvpsiz];
+       at91sam7_info->target_name = "Unknown";
        
-       DEBUG("nvptyp: 0x%3.3x, arch: 0x%4.4x, alt_id: 0x%4.4x, alt_addr: 0x%4.4x", at91sam7_info->cidr_nvptyp, at91sam7_info->cidr_arch );
+       DEBUG("nvptyp: 0x%3.3x, arch: 0x%4.4x", at91sam7_info->cidr_nvptyp, at91sam7_info->cidr_arch );
 
-       /* Read main clock freqency register */
-       target->type->read_memory(target, CKGR_MCFR, 4, 1, (u8 *)&mcfr);
-       if (mcfr&0x10000)
-       {
-               at91sam7_info->mainrdy = 1;
-               at91sam7_info->mainf = mcfr&0xFFFF;
-               at91sam7_info->usec_clocks = mcfr>>9;
-       }
-       else 
-       {
-               at91sam7_info->mainrdy = 0;
-               at91sam7_info->mainf = 0;
-               at91sam7_info->usec_clocks = 0;
-       }
+       /* Read main and master clock freqency register */
+       at91sam7_read_clock_info(bank);
        
        status = at91sam7_get_flash_status(bank);
        at91sam7_info->lockbits = status>>16;
@@ -252,6 +345,7 @@ int at91sam7_read_part_info(struct flash_bank_s *bank)
                bank->bus_width = 4;
                if (bank->size==0x40000)  /* AT91SAM7S256 */
                {
+                       at91sam7_info->target_name = "AT91SAM7S256";
                        at91sam7_info->num_lockbits = 16;
                        at91sam7_info->pagesize = 256;
                        at91sam7_info->pages_in_lockregion = 64;
@@ -259,6 +353,7 @@ int at91sam7_read_part_info(struct flash_bank_s *bank)
                }
                if (bank->size==0x20000)  /* AT91SAM7S128 */
                {
+                       at91sam7_info->target_name = "AT91SAM7S128";
                        at91sam7_info->num_lockbits = 8;
                        at91sam7_info->pagesize = 256;
                        at91sam7_info->pages_in_lockregion = 64;
@@ -266,6 +361,7 @@ int at91sam7_read_part_info(struct flash_bank_s *bank)
                }
                if (bank->size==0x10000)  /* AT91SAM7S64 */
                {
+                       at91sam7_info->target_name = "AT91SAM7S64";
                        at91sam7_info->num_lockbits = 16;
                        at91sam7_info->pagesize = 128;
                        at91sam7_info->pages_in_lockregion = 32;
@@ -273,6 +369,7 @@ int at91sam7_read_part_info(struct flash_bank_s *bank)
                }
                if (bank->size==0x08000)  /* AT91SAM7S321/32 */
                {
+                       at91sam7_info->target_name = "AT91SAM7S321/32";
                        at91sam7_info->num_lockbits = 8;
                        at91sam7_info->pagesize = 128;
                        at91sam7_info->pages_in_lockregion = 32;
@@ -284,12 +381,13 @@ int at91sam7_read_part_info(struct flash_bank_s *bank)
 
        if (at91sam7_info->cidr_arch == 0x71 )
        {
-               at91sam7_info->num_nvmbits = 2;
-               at91sam7_info->nvmbits = (status>>8)&0x03;
+               at91sam7_info->num_nvmbits = 3;
+               at91sam7_info->nvmbits = (status>>8)&0x07;
                bank->base = 0x100000;
                bank->bus_width = 4;
                if (bank->size==0x40000)  /* AT91SAM7XC256 */
                {
+                       at91sam7_info->target_name = "AT91SAM7XC256";
                        at91sam7_info->num_lockbits = 16;
                        at91sam7_info->pagesize = 256;
                        at91sam7_info->pages_in_lockregion = 64;
@@ -297,6 +395,7 @@ int at91sam7_read_part_info(struct flash_bank_s *bank)
                }
                if (bank->size==0x20000)  /* AT91SAM7XC128 */
                {
+                       at91sam7_info->target_name = "AT91SAM7XC128";
                        at91sam7_info->num_lockbits = 8;
                        at91sam7_info->pagesize = 256;
                        at91sam7_info->pages_in_lockregion = 64;
@@ -306,6 +405,40 @@ int at91sam7_read_part_info(struct flash_bank_s *bank)
                return ERROR_OK;
        }
        
+       if (at91sam7_info->cidr_arch == 0x72 )
+       {
+               at91sam7_info->num_nvmbits = 2;
+               at91sam7_info->nvmbits = (status>>8)&0x03;
+               bank->base = 0x100000;
+               bank->bus_width = 4;
+               if (bank->size==0x80000) /* AT91SAM7SE512 */
+               {
+                       at91sam7_info->target_name = "AT91SAM7SE512";
+                       at91sam7_info->num_lockbits = 32;
+                       at91sam7_info->pagesize = 256;
+                       at91sam7_info->pages_in_lockregion = 64;
+                       at91sam7_info->num_pages = 32*64;
+               }
+               if (bank->size==0x40000)
+               {
+                       at91sam7_info->target_name = "AT91SAM7SE256";
+                       at91sam7_info->num_lockbits = 16;
+                       at91sam7_info->pagesize = 256;
+                       at91sam7_info->pages_in_lockregion = 64;
+                       at91sam7_info->num_pages = 16*64;
+               }
+               if (bank->size==0x08000)
+               {
+                       at91sam7_info->target_name = "AT91SAM7SE32";
+                       at91sam7_info->num_lockbits = 8;
+                       at91sam7_info->pagesize = 128;
+                       at91sam7_info->pages_in_lockregion = 32;
+                       at91sam7_info->num_pages = 8*32;
+               }
+               
+               return ERROR_OK;
+       }
+       
        if (at91sam7_info->cidr_arch == 0x75 )
        {
                at91sam7_info->num_nvmbits = 3;
@@ -314,6 +447,7 @@ int at91sam7_read_part_info(struct flash_bank_s *bank)
                bank->bus_width = 4;
                if (bank->size==0x40000)  /* AT91SAM7X256 */
                {
+                       at91sam7_info->target_name = "AT91SAM7X256";
                        at91sam7_info->num_lockbits = 16;
                        at91sam7_info->pagesize = 256;
                        at91sam7_info->pages_in_lockregion = 64;
@@ -321,6 +455,7 @@ int at91sam7_read_part_info(struct flash_bank_s *bank)
                }
                if (bank->size==0x20000)  /* AT91SAM7X128 */
                {
+                       at91sam7_info->target_name = "AT91SAM7X128";
                        at91sam7_info->num_lockbits = 8;
                        at91sam7_info->pagesize = 256;
                        at91sam7_info->pages_in_lockregion = 64;
@@ -339,9 +474,10 @@ int at91sam7_read_part_info(struct flash_bank_s *bank)
                
                if (bank->size == 0x40000)  /* AT91SAM7A3 */
                {
+                       at91sam7_info->target_name = "AT91SAM7A3";
                        at91sam7_info->num_lockbits = 16;
                        at91sam7_info->pagesize = 256;
-                       at91sam7_info->pages_in_lockregion = 64;
+                     at91sam7_info->pages_in_lockregion = 16;
                        at91sam7_info->num_pages = 16*64;
                }
                return ERROR_OK;
@@ -355,8 +491,6 @@ int at91sam7_read_part_info(struct flash_bank_s *bank)
 int at91sam7_erase_check(struct flash_bank_s *bank)
 {
        at91sam7_flash_bank_t *at91sam7_info = bank->driver_priv;
-       target_t *target = at91sam7_info->target;
-       int i;
        
        if (!at91sam7_info->working_area_size)
        {
@@ -373,7 +507,6 @@ int at91sam7_protect_check(struct flash_bank_s *bank)
        u32 status;
        
        at91sam7_flash_bank_t *at91sam7_info = bank->driver_priv;
-       target_t *target = at91sam7_info->target;
 
        if (at91sam7_info->cidr == 0)
        {
@@ -387,19 +520,11 @@ int at91sam7_protect_check(struct flash_bank_s *bank)
        }
                
        status = at91sam7_get_flash_status(bank);
-       at91sam7_info->lockbits = status>>16;
+       at91sam7_info->lockbits = status >> 16;
        
        return ERROR_OK;
 }
 
-
-int at91sam7_register_commands(struct command_context_s *cmd_ctx)
-{
-       command_t *at91sam7_cmd = register_command(cmd_ctx, NULL, "at91sam7", NULL, COMMAND_ANY, "at91sam7 specific commands");
-
-       return ERROR_OK;
-}
-
 int at91sam7_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank)
 {
        at91sam7_flash_bank_t *at91sam7_info;
@@ -416,11 +541,10 @@ int at91sam7_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, ch
        at91sam7_info->target = get_target_by_num(strtoul(args[5], NULL, 0));
        if (!at91sam7_info->target)
        {
-               ERROR("no target '%i' configured", args[5]);
+               ERROR("no target '%s' configured", args[5]);
                exit(-1);
        }
        
-       
        /* part wasn't probed for info yet */
        at91sam7_info->cidr = 0;
        
@@ -452,11 +576,15 @@ int at91sam7_erase(struct flash_bank_s *bank, int first, int last)
                return ERROR_FLASH_SECTOR_INVALID;
        }
 
-        if ((first == 0) && (last == (at91sam7_info->num_lockbits-1)))
-        {
-               return at91sam7_flash_command(bank, EA, 0);
-        }
-        
+       /* Configure the flash controller timing */
+       at91sam7_read_clock_info(bank); 
+       at91sam7_set_flash_mode(bank,FMR_TIMING_FLASH);
+
+       if ((first == 0) && (last == (at91sam7_info->num_lockbits-1)))
+       {
+               return at91sam7_flash_command(bank, EA, 0);
+       }
+
        WARNING("Can only erase the whole flash area, pages are autoerased on write");
        return ERROR_FLASH_OPERATION_FAILED;
 }
@@ -467,7 +595,6 @@ int at91sam7_protect(struct flash_bank_s *bank, int set, int first, int last)
        int lockregion;
        
        at91sam7_flash_bank_t *at91sam7_info = bank->driver_priv;
-       target_t *target = at91sam7_info->target;
        
        if (at91sam7_info->target->state != TARGET_HALTED)
        {
@@ -490,8 +617,9 @@ int at91sam7_protect(struct flash_bank_s *bank, int set, int first, int last)
                return ERROR_FLASH_OPERATION_FAILED;
        }
        
-       /* Configure the flash controller timing */     
-       at91sam7_set_flash_mode(bank,1);
+       /* Configure the flash controller timing */
+       at91sam7_read_clock_info(bank); 
+       at91sam7_set_flash_mode(bank,FMR_TIMING_NVBITS);
        
        for (lockregion=first;lockregion<=last;lockregion++) 
        {
@@ -519,7 +647,6 @@ int at91sam7_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
        target_t *target = at91sam7_info->target;
        u32 dst_min_alignment, wcount, bytes_remaining = count;
        u32 first_page, last_page, pagen, buffer_pos;
-       u32 fcr;
        
        if (at91sam7_info->target->state != TARGET_HALTED)
        {
@@ -548,9 +675,6 @@ int at91sam7_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
                return ERROR_FLASH_DST_BREAKS_ALIGNMENT;
        }
        
-       if (offset + count > bank->size)
-               return ERROR_FLASH_DST_OUT_OF_BANK;
-       
        if (at91sam7_info->cidr_arch == 0)
                return ERROR_FLASH_BANK_NOT_PROBED;
 
@@ -560,7 +684,8 @@ int at91sam7_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
        DEBUG("first_page: %i, last_page: %i, count %i", first_page, last_page, count);
        
        /* Configure the flash controller timing */     
-       at91sam7_set_flash_mode(bank,2);
+       at91sam7_read_clock_info(bank); 
+       at91sam7_set_flash_mode(bank,FMR_TIMING_FLASH);
 
        for (pagen=first_page; pagen<last_page; pagen++) {
                if (bytes_remaining<dst_min_alignment) 
@@ -579,7 +704,7 @@ int at91sam7_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
                {
                        return ERROR_FLASH_OPERATION_FAILED;
                }       
-               DEBUG("Flash command: 0x%x, pagenumber:", fcr, pagen);
+               DEBUG("Write page number:%i", pagen);
        }
        
        return ERROR_OK;
@@ -603,6 +728,7 @@ int at91sam7_probe(struct flash_bank_s *bank)
                WARNING("Cannot identify target as an AT91SAM");
                return ERROR_FLASH_OPERATION_FAILED;
        }
+       
        return ERROR_OK;
 }
 
@@ -611,10 +737,7 @@ int at91sam7_info(struct flash_bank_s *bank, char *buf, int buf_size)
        int printed;
        at91sam7_flash_bank_t *at91sam7_info = bank->driver_priv;
        
-       if (at91sam7_info->cidr == 0)
-       {
-               at91sam7_read_part_info(bank);
-       }
+       at91sam7_read_part_info(bank);
 
        if (at91sam7_info->cidr == 0)
        {
@@ -624,7 +747,7 @@ int at91sam7_info(struct flash_bank_s *bank, char *buf, int buf_size)
                return ERROR_FLASH_OPERATION_FAILED;
        }
        
-       printed = snprintf(buf, buf_size, "\nat91sam7 information:\n");
+       printed = snprintf(buf, buf_size, "\nat91sam7 information: Chip is %s\n",at91sam7_info->target_name);
        buf += printed;
        buf_size -= printed;
        
@@ -632,7 +755,7 @@ int at91sam7_info(struct flash_bank_s *bank, char *buf, int buf_size)
        buf += printed;
        buf_size -= printed;
                        
-       printed = snprintf(buf, buf_size, "main clock(estimated): %ikHz \n", at91sam7_info->mainf*2);
+       printed = snprintf(buf, buf_size, "master clock(estimated): %ikHz \n", at91sam7_info->mck_freq / 1000);
        buf += printed;
        buf_size -= printed;
        
@@ -648,3 +771,92 @@ int at91sam7_info(struct flash_bank_s *bank, char *buf, int buf_size)
 
        return ERROR_OK;
 }
+
+/* 
+* On AT91SAM7S: When the gpnmv bits are set with 
+* > at91sam7 gpnvm 0 bitnr set
+* the changes are not visible in the flash controller status register MC_FSR 
+* until the processor has been reset.
+* On the Olimex board this requires a power cycle.
+* Note that the AT91SAM7S has the following errata (doc6175.pdf sec 14.1.3):
+*      The maximum number of write/erase cycles for Non Volatile Memory bits is 100. This includes
+*      Lock Bits (LOCKx), General Purpose NVM bits (GPNVMx) and the Security Bit.
+*/
+int at91sam7_handle_gpnvm_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+{
+       flash_bank_t *bank;
+       int bit;
+       u8  flashcmd;
+       u32 status;
+       char *value;
+       at91sam7_flash_bank_t *at91sam7_info;
+
+       if (argc < 3)
+       {
+               command_print(cmd_ctx, "at91sam7 gpnvm <num> <bit> <set|clear>");
+               return ERROR_OK;
+       }
+       
+       bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
+       bit = atoi(args[1]);
+       value = args[2];
+
+       if (!bank)
+       {
+               command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
+               return ERROR_OK;
+       }
+
+       at91sam7_info = bank->driver_priv;
+
+       if (at91sam7_info->target->state != TARGET_HALTED)
+       {
+               return ERROR_TARGET_NOT_HALTED;
+       }
+       
+       if (at91sam7_info->cidr == 0)
+       {
+               at91sam7_read_part_info(bank);
+       }
+
+       if (at91sam7_info->cidr == 0)
+       {
+               WARNING("Cannot identify target as an AT91SAM");
+               return ERROR_FLASH_OPERATION_FAILED;
+       }
+
+       if ((bit<0) || (at91sam7_info->num_nvmbits <= bit))
+       { 
+               command_print(cmd_ctx, "gpnvm bit '#%s' is out of bounds for target %s", args[1],at91sam7_info->target_name);
+               return ERROR_OK;
+       }
+
+       if (strcmp(value, "set") == 0)
+       {
+               flashcmd = SGPB;
+       }
+       else if (strcmp(value, "clear") == 0)
+       {
+               flashcmd = CGPB;
+       }
+       else
+       {
+               command_print(cmd_ctx, "usage: at91sam7 gpnvm <num> <bit> <set|clear>");
+               return ERROR_OK;
+       }
+
+       /* Configure the flash controller timing */
+       at91sam7_read_clock_info(bank); 
+       at91sam7_set_flash_mode(bank,FMR_TIMING_NVBITS);
+       
+       if (at91sam7_flash_command(bank, flashcmd, (u16)(bit)) != ERROR_OK) 
+       {
+               return ERROR_FLASH_OPERATION_FAILED;
+       }       
+
+       status = at91sam7_get_flash_status(bank);
+       DEBUG("at91sam7_handle_gpnvm_command: cmd 0x%x, value 0x%x, status 0x%x \n",flashcmd,bit,status);
+       at91sam7_info->nvmbits = (status>>8)&((1<<at91sam7_info->num_nvmbits)-1);
+
+       return ERROR_OK;
+}