Gheorghe Guran <roatlasro@yahoo.com> redone at91sam7 driver. Old driver source file...
[openocd.git] / src / flash / stellaris.c
index 502659e3f21065e1e7269a8cbe610d7718132a43..895fda1b61bd7115cd5ce7207d14bfec72f6fe66 100644 (file)
@@ -2,6 +2,9 @@
  *   Copyright (C) 2006 by Magnus Lundin                                   *
  *   lundin@mlu.mine.nu                                                    *
  *                                                                         *
+ *   Copyright (C) 2008 by Spencer Oliver                                  *
+ *   spen@spen-soft.co.uk                                                  *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -19,7 +22,7 @@
  ***************************************************************************/
 
 /***************************************************************************
-* STELLARIS is tested on LM3S811
+* STELLARIS is tested on LM3S811, LM3S6965
 ***************************************************************************/
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -48,7 +51,6 @@ int stellaris_protect(struct flash_bank_s *bank, int set, int first, int last);
 int stellaris_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count);
 int stellaris_auto_probe(struct flash_bank_s *bank);
 int stellaris_probe(struct flash_bank_s *bank);
-int stellaris_erase_check(struct flash_bank_s *bank);
 int stellaris_protect_check(struct flash_bank_s *bank);
 int stellaris_info(struct flash_bank_s *bank, char *buf, int buf_size);
 
@@ -58,6 +60,8 @@ void stellaris_set_flash_mode(flash_bank_t *bank,int mode);
 u32 stellaris_wait_status_busy(flash_bank_t *bank, u32 waitbits, int timeout);
 
 int stellaris_read_part_info(struct flash_bank_s *bank);
+int stellaris_handle_mass_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+int stellaris_mass_erase(struct flash_bank_s *bank);
 
 flash_driver_t stellaris_flash =
 {
@@ -69,12 +73,11 @@ flash_driver_t stellaris_flash =
        .write = stellaris_write,
        .probe = stellaris_probe,
        .auto_probe = stellaris_auto_probe,
-       .erase_check = stellaris_erase_check,
+       .erase_check = default_flash_mem_blank_check,
        .protect_check = stellaris_protect_check,
        .info = stellaris_info
 };
 
-
 struct {
        u32 partno;
        char *partname;
@@ -82,6 +85,11 @@ struct {
 {
        {0x01,"LM3S101"},
        {0x02,"LM3S102"},
+       {0x03,"LM3S1625"},
+       {0x04,"LM3S1626"},
+       {0x05,"LM3S1627"},
+       {0x06,"LM3S1607"},
+       {0x10,"LM3S1776"},
        {0x19,"LM3S300"},
        {0x11,"LM3S301"},
        {0x12,"LM3S310"},
@@ -107,10 +115,20 @@ struct {
        {0x39,"LM3S808"},
        {0x32,"LM3S811"},
        {0x33,"LM3S812"},
+       /*{0x33,"LM3S2616"},*/
        {0x34,"LM3S815"},
        {0x36,"LM3S817"},
        {0x37,"LM3S818"},
        {0x35,"LM3S828"},
+       {0x39,"LM3S2276"},
+       {0x3A,"LM3S2776"},
+       {0x43,"LM3S3651"},
+       {0x44,"LM3S3739"},
+       {0x45,"LM3S3749"},
+       {0x46,"LM3S3759"},
+       {0x48,"LM3S3768"},
+       {0x49,"LM3S3748"},
+       {0x50,"LM3S2678"},
        {0x51,"LM3S2110"},
        {0x52,"LM3S2739"},
        {0x53,"LM3S2651"},
@@ -134,6 +152,8 @@ struct {
        {0x76,"LM3S6537"},
        {0x77,"LM3S6753"},
        {0x78,"LM3S6952"},
+       {0x80,"LM3S2671"},
+       {0x81,"LM3S5632"},
        {0x82,"LM3S6422"},
        {0x83,"LM3S6633"},
        {0x84,"LM3S2139"},
@@ -141,17 +161,30 @@ struct {
        {0x86,"LM3S8738"},
        {0x88,"LM3S8938"},
        {0x89,"LM3S6938"},
+       {0x8A,"LM3S5652"},
        {0x8B,"LM3S6637"},
        {0x8C,"LM3S8933"},
        {0x8D,"LM3S8733"},
        {0x8E,"LM3S8538"},
        {0x8F,"LM3S2948"},
+       {0x91,"LM3S5662"},
+       {0x96,"LM3S5732"},
+       {0x97,"LM3S5737"},
+       {0x99,"LM3S5747"},
+       {0x9A,"LM3S5752"},
+       {0x9B,"LM3S5757"},
+       {0x9C,"LM3S5762"},
+       {0x9D,"LM3S5767"},
+       {0xA0,"LM3S5739"},
        {0xA1,"LM3S6100"},
        {0xA2,"LM3S2410"},
        {0xA3,"LM3S6730"},
        {0xA4,"LM3S2730"},
        {0xA5,"LM3S6420"},
        {0xA6,"LM3S8962"},
+       {0xA7,"LM3S5749"},
+       {0xA8,"LM3S5769"},
+       {0xA9,"LM3S5768"},
        {0xB3,"LM3S1635"},
        {0xB4,"LM3S1850"},
        {0xB5,"LM3S1960"},
@@ -201,10 +234,13 @@ struct {
        {0,"Unknown part"}
 };
 
-char * StellarisClassname[2] =
+char * StellarisClassname[5] =
 {
        "Sandstorm",
-       "Fury"
+       "Fury",
+       "Unknown",
+       "DustDevil",
+       "Tempest"
 };
 
 /***************************************************************************
@@ -223,7 +259,7 @@ int stellaris_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, c
                return ERROR_FLASH_BANK_INVALID;
        }
        
-       stellaris_info = calloc(sizeof(stellaris_flash_bank_t),1);
+       stellaris_info = calloc(sizeof(stellaris_flash_bank_t), 1);
        bank->base = 0x0;
        bank->driver_priv = stellaris_info;
        
@@ -238,11 +274,9 @@ int stellaris_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, c
 
 int stellaris_register_commands(struct command_context_s *cmd_ctx)
 {
-/*
-       command_t *stellaris_cmd = register_command(cmd_ctx, NULL, "stellaris", NULL, COMMAND_ANY, NULL);
-       register_command(cmd_ctx, stellaris_cmd, "gpnvm", stellaris_handle_gpnvm_command, COMMAND_EXEC,
-                       "stellaris gpnvm <num> <bit> set|clear, set or clear stellaris gpnvm bit");
-*/
+       command_t *stm32x_cmd = register_command(cmd_ctx, NULL, "stellaris", NULL, COMMAND_ANY, "stellaris flash specific commands");
+       
+       register_command(cmd_ctx, stm32x_cmd, "mass_erase", stellaris_handle_mass_erase_command, COMMAND_EXEC, "mass erase device");
        return ERROR_OK;
 }
 
@@ -261,9 +295,9 @@ int stellaris_info(struct flash_bank_s *bank, char *buf, int buf_size)
                return ERROR_FLASH_OPERATION_FAILED;
        }
        
-       if (DID0_VER(stellaris_info->did0)>0)
+       if (DID0_VER(stellaris_info->did0) > 0)
        {
-               device_class = (stellaris_info->did0>>16)&0xFF;
+               device_class = (stellaris_info->did0>>16) & 0xFF;
        }
        else
        {
@@ -271,20 +305,21 @@ int stellaris_info(struct flash_bank_s *bank, char *buf, int buf_size)
        }       
        printed = snprintf(buf, buf_size, "\nLMI Stellaris information: Chip is class %i(%s) %s v%c.%i\n",
          device_class, StellarisClassname[device_class], stellaris_info->target_name,
-         'A' + ((stellaris_info->did0>>8)&0xFF), (stellaris_info->did0)&0xFF);
+         'A' + ((stellaris_info->did0>>8) & 0xFF), (stellaris_info->did0) & 0xFF);
        buf += printed;
        buf_size -= printed;
 
-       printed = snprintf(buf, buf_size, "did1: 0x%8.8x, arch: 0x%4.4x, eproc: %s, ramsize:%ik,  flashsize: %ik\n", 
-        stellaris_info->did1, stellaris_info->did1, "ARMV7M", (1+((stellaris_info->dc0>>16)&0xFFFF))/4, (1+(stellaris_info->dc0&0xFFFF))*2);
+       printed = snprintf(buf, buf_size, "did1: 0x%8.8x, arch: 0x%4.4x, eproc: %s, ramsize:%ik, flashsize: %ik\n", 
+        stellaris_info->did1, stellaris_info->did1, "ARMV7M", (1+((stellaris_info->dc0>>16) & 0xFFFF))/4, (1+(stellaris_info->dc0 & 0xFFFF))*2);
        buf += printed;
        buf_size -= printed;
 
-       printed = snprintf(buf, buf_size, "master clock(estimated): %ikHz,  rcc is 0x%x \n", stellaris_info->mck_freq / 1000, stellaris_info->rcc);
+       printed = snprintf(buf, buf_size, "master clock(estimated): %ikHz, rcc is 0x%x \n", stellaris_info->mck_freq / 1000, stellaris_info->rcc);
        buf += printed;
        buf_size -= printed;
 
-       if (stellaris_info->num_lockbits>0) {           
+       if (stellaris_info->num_lockbits>0)
+       {
                printed = snprintf(buf, buf_size, "pagesize: %i, lockbits: %i 0x%4.4x, pages in lock region: %i \n", stellaris_info->pagesize, stellaris_info->num_lockbits, stellaris_info->lockbits,stellaris_info->num_pages/stellaris_info->num_lockbits);
                buf += printed;
                buf_size -= printed;
@@ -316,15 +351,15 @@ void stellaris_read_clock_info(flash_bank_t *bank)
        unsigned long mainfreq;
 
        target_read_u32(target, SCB_BASE|RCC, &rcc);
-       LOG_DEBUG("Stellaris RCC %x",rcc);
+       LOG_DEBUG("Stellaris RCC %x", rcc);
        target_read_u32(target, SCB_BASE|PLLCFG, &pllcfg);
-       LOG_DEBUG("Stellaris PLLCFG %x",pllcfg);
+       LOG_DEBUG("Stellaris PLLCFG %x", pllcfg);
        stellaris_info->rcc = rcc;
        
-       sysdiv = (rcc>>23)&0xF;
-       usesysdiv = (rcc>>22)&0x1;
-       bypass = (rcc>>11)&0x1;
-       oscsrc = (rcc>>4)&0x3;
+       sysdiv = (rcc>>23) & 0xF;
+       usesysdiv = (rcc>>22) & 0x1;
+       bypass = (rcc>>11) & 0x1;
+       oscsrc = (rcc>>4) & 0x3;
        /* xtal = (rcc>>6)&0xF; */
        switch (oscsrc)
        {
@@ -356,7 +391,7 @@ void stellaris_read_clock_info(flash_bank_t *bank)
                stellaris_info->mck_freq = mainfreq;
        
        /* Forget old flash timing */
-       stellaris_set_flash_mode(bank,0);
+       stellaris_set_flash_mode(bank, 0);
 }
 
 /* Setup the timimg registers */
@@ -367,8 +402,7 @@ void stellaris_set_flash_mode(flash_bank_t *bank,int mode)
 
        u32 usecrl = (stellaris_info->mck_freq/1000000ul-1);
        LOG_DEBUG("usecrl = %i",usecrl);        
-       target_write_u32(target, SCB_BASE|USECRL , usecrl);
-       
+       target_write_u32(target, SCB_BASE|USECRL, usecrl);
 }
 
 u32 stellaris_wait_status_busy(flash_bank_t *bank, u32 waitbits, int timeout)
@@ -379,7 +413,7 @@ u32 stellaris_wait_status_busy(flash_bank_t *bank, u32 waitbits, int timeout)
        while (((status = stellaris_get_flash_status(bank)) & waitbits) && (timeout-- > 0))
        {
                LOG_DEBUG("status: 0x%x", status);
-               usleep(1000);
+               alive_sleep(1);
        }
        
        /* Flash errors are reflected in the FLASH_CRIS register */
@@ -387,7 +421,6 @@ u32 stellaris_wait_status_busy(flash_bank_t *bank, u32 waitbits, int timeout)
        return status;
 }
 
-
 /* Send one command to the flash controller */
 int stellaris_flash_command(struct flash_bank_s *bank,u8 cmd,u16 pagen) 
 {
@@ -411,7 +444,7 @@ int stellaris_read_part_info(struct flash_bank_s *bank)
 {
        stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
        target_t *target = bank->target;
-       u32 did0,did1, ver, fam, status;
+       u32 did0, did1, ver, fam, status;
        int i;
        
        /* Read and parse chip identification register */
@@ -419,13 +452,13 @@ int stellaris_read_part_info(struct flash_bank_s *bank)
        target_read_u32(target, SCB_BASE|DID1, &did1);
        target_read_u32(target, SCB_BASE|DC0, &stellaris_info->dc0);
        target_read_u32(target, SCB_BASE|DC1, &stellaris_info->dc1);
-       LOG_DEBUG("did0 0x%x, did1 0x%x, dc0 0x%x, dc1 0x%x",did0, did1, stellaris_info->dc0,stellaris_info->dc1);
+       LOG_DEBUG("did0 0x%x, did1 0x%x, dc0 0x%x, dc1 0x%x", did0, did1, stellaris_info->dc0, stellaris_info->dc1);
 
        ver = did0 >> 28;
        if((ver != 0) && (ver != 1))
        {
                LOG_WARNING("Unknown did0 version, cannot identify target");
-               return ERROR_FLASH_OPERATION_FAILED;    
+               return ERROR_FLASH_OPERATION_FAILED;
        }
 
        if (did1 == 0)
@@ -441,9 +474,9 @@ int stellaris_read_part_info(struct flash_bank_s *bank)
                LOG_WARNING("Unknown did1 version/family, cannot positively identify target as a Stellaris");
        }
 
-       for (i=0;StellarisParts[i].partno;i++)
+       for (i = 0; StellarisParts[i].partno; i++)
        {
-               if (StellarisParts[i].partno==((did1>>16)&0xFF))
+               if (StellarisParts[i].partno == ((did1 >> 16) & 0xFF))
                        break;
        }
        
@@ -452,10 +485,10 @@ int stellaris_read_part_info(struct flash_bank_s *bank)
        stellaris_info->did0 = did0;
        stellaris_info->did1 = did1;
 
-       stellaris_info->num_lockbits = 1+(stellaris_info->dc0&0xFFFF);
-       stellaris_info->num_pages = 2*(1+(stellaris_info->dc0&0xFFFF));
+       stellaris_info->num_lockbits = 1 + (stellaris_info->dc0 & 0xFFFF);
+       stellaris_info->num_pages = 2 *(1+(stellaris_info->dc0 & 0xFFFF));
        stellaris_info->pagesize = 1024;
-       bank->size = 1024*stellaris_info->num_pages;
+       bank->size = 1024 * stellaris_info->num_pages;
        stellaris_info->pages_in_lockregion = 2;
        target_read_u32(target, SCB_BASE|FMPPE, &stellaris_info->lockbits);
 
@@ -464,7 +497,7 @@ int stellaris_read_part_info(struct flash_bank_s *bank)
        bank->sectors = malloc(sizeof(flash_sector_t) * bank->num_sectors);
        for (i = 0; i < bank->num_sectors; i++)
        {
-               bank->sectors[i].offset = i*stellaris_info->pagesize;
+               bank->sectors[i].offset = i * stellaris_info->pagesize;
                bank->sectors[i].size = stellaris_info->pagesize;
                bank->sectors[i].is_erased = -1;
                bank->sectors[i].is_protected = -1;
@@ -482,19 +515,6 @@ int stellaris_read_part_info(struct flash_bank_s *bank)
 *      flash operations                                                       *
 ***************************************************************************/
 
-int stellaris_erase_check(struct flash_bank_s *bank)
-{
-       /* 
-       
-       stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
-       target_t *target = bank->target;
-       int i;
-       
-       */
-       
-       return ERROR_OK;
-}
-
 int stellaris_protect_check(struct flash_bank_s *bank)
 {
        u32 status;
@@ -503,6 +523,7 @@ int stellaris_protect_check(struct flash_bank_s *bank)
 
        if (bank->target->state != TARGET_HALTED)
        {
+               LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
 
@@ -532,6 +553,7 @@ int stellaris_erase(struct flash_bank_s *bank, int first, int last)
        
        if (bank->target->state != TARGET_HALTED)
        {
+               LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
 
@@ -550,7 +572,12 @@ int stellaris_erase(struct flash_bank_s *bank, int first, int last)
        {
                return ERROR_FLASH_SECTOR_INVALID;
        }
-
+       
+       if ((first == 0) && (last == (stellaris_info->num_pages-1)))
+       {
+               return stellaris_mass_erase(bank);
+       }
+       
        /* Configure the flash controller timing */
        stellaris_read_clock_info(bank);        
        stellaris_set_flash_mode(bank,0);
@@ -558,38 +585,11 @@ int stellaris_erase(struct flash_bank_s *bank, int first, int last)
        /* Clear and disable flash programming interrupts */
        target_write_u32(target, FLASH_CIM, 0);
        target_write_u32(target, FLASH_MISC, PMISC|AMISC);
-
-       if ((first == 0) && (last == (stellaris_info->num_pages-1)))
-       {
-               target_write_u32(target, FLASH_FMA, 0);
-               target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_MERASE);
-               /* Wait until erase complete */
-               do
-               {
-                       target_read_u32(target, FLASH_FMC, &flash_fmc);
-               }
-               while(flash_fmc & FMC_MERASE);
-               
-               /* if device has > 128k, then second erase cycle is needed */
-               if(stellaris_info->num_pages * stellaris_info->pagesize > 0x20000)
-               {
-                       target_write_u32(target, FLASH_FMA, 0x20000);
-                       target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_MERASE);
-                       /* Wait until erase complete */
-                       do
-                       {
-                               target_read_u32(target, FLASH_FMC, &flash_fmc);
-                       }
-                       while(flash_fmc & FMC_MERASE);
-               }
-
-               return ERROR_OK;
-       }
-
-       for (banknr=first;banknr<=last;banknr++)
+       
+       for (banknr = first; banknr <= last; banknr++)
        {
                /* Address is first word in page */
-               target_write_u32(target, FLASH_FMA, banknr*stellaris_info->pagesize);
+               target_write_u32(target, FLASH_FMA, banknr * stellaris_info->pagesize);
                /* Write erase command */
                target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_ERASE);
                /* Wait until erase complete */
@@ -607,6 +607,8 @@ int stellaris_erase(struct flash_bank_s *bank, int first, int last)
                        target_write_u32(target, FLASH_CRIS, 0);
                        return ERROR_FLASH_OPERATION_FAILED;
                }
+               
+               bank->sectors[banknr].is_erased = 1;
        }
 
        return ERROR_OK;
@@ -622,6 +624,7 @@ int stellaris_protect(struct flash_bank_s *bank, int set, int first, int last)
        
        if (bank->target->state != TARGET_HALTED)
        {
+               LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
        
@@ -642,16 +645,16 @@ int stellaris_protect(struct flash_bank_s *bank, int set, int first, int last)
        }
        
        /* Configure the flash controller timing */
-       stellaris_read_clock_info(bank);        
-       stellaris_set_flash_mode(bank,0);
+       stellaris_read_clock_info(bank);
+       stellaris_set_flash_mode(bank, 0);
 
-       fmppe = stellaris_info->lockbits;       
-       for (lockregion=first;lockregion<=last;lockregion++) 
+       fmppe = stellaris_info->lockbits;
+       for (lockregion = first; lockregion <= last; lockregion++)
        {
                if (set)
-                        fmppe &= ~(1<<lockregion); 
+                       fmppe &= ~(1<<lockregion); 
                else
-                        fmppe |= (1<<lockregion); 
+                       fmppe |= (1<<lockregion); 
        }
 
        /* Clear and disable flash programming interrupts */
@@ -683,7 +686,7 @@ int stellaris_protect(struct flash_bank_s *bank, int set, int first, int last)
        }
        
        target_read_u32(target, SCB_BASE|FMPPE, &stellaris_info->lockbits);
-               
+       
        return ERROR_OK;
 }
 
@@ -719,7 +722,8 @@ u8 stellaris_write_code[] =
        0x04,0x36,                      /* adds r6, r6, #4 */
        0x96,0x42,                      /* cmp  r6, r2 */
        0xF4,0xD1,                      /* bne  mainloop */
-       0x00,0xBE,                      /* bkpt #0 */
+                                               /* exit: */
+       0xFE,0xE7,                      /* b exit */
 /* pFLASH_CTRL_BASE: */
        0x00,0xD0,0x0F,0x40,    /* .word        0x400FD000 */
 /* FLASHWRITECMD: */
@@ -733,19 +737,19 @@ int stellaris_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
        working_area_t *source;
        working_area_t *write_algorithm;
        u32 address = bank->base + offset;
-       reg_param_t reg_params[8];
+       reg_param_t reg_params[3];
        armv7m_algorithm_t armv7m_info;
-       int retval;
+       int retval = ERROR_OK;
        
        LOG_DEBUG("(bank=%p buffer=%p offset=%08X wcount=%08X)",
                        bank, buffer, offset, wcount);
 
        /* flash write code */
        if (target_alloc_working_area(target, sizeof(stellaris_write_code), &write_algorithm) != ERROR_OK)
-               {
-                       LOG_WARNING("no working area available, can't do block memory writes");
-                       return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
-               };
+       {
+               LOG_WARNING("no working area available, can't do block memory writes");
+               return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
+       };
 
        target_write_buffer(target, write_algorithm->address, sizeof(stellaris_write_code), stellaris_write_code);
 
@@ -768,17 +772,11 @@ int stellaris_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
        
        armv7m_info.common_magic = ARMV7M_COMMON_MAGIC;
        armv7m_info.core_mode = ARMV7M_MODE_ANY;
-       armv7m_info.core_state = ARMV7M_STATE_THUMB;
        
        init_reg_param(&reg_params[0], "r0", 32, PARAM_OUT);
        init_reg_param(&reg_params[1], "r1", 32, PARAM_OUT);
        init_reg_param(&reg_params[2], "r2", 32, PARAM_OUT);
-       init_reg_param(&reg_params[3], "r3", 32, PARAM_OUT);
-       init_reg_param(&reg_params[4], "r4", 32, PARAM_OUT);
-       init_reg_param(&reg_params[5], "r5", 32, PARAM_OUT);
-       init_reg_param(&reg_params[6], "r6", 32, PARAM_OUT);
-       init_reg_param(&reg_params[7], "r7", 32, PARAM_OUT);
-
+       
        while (wcount > 0)
        {
                u32 thisrun_count = (wcount > (buffer_size / 4)) ? (buffer_size / 4) : wcount;
@@ -788,16 +786,13 @@ int stellaris_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
                buf_set_u32(reg_params[0].value, 0, 32, source->address);
                buf_set_u32(reg_params[1].value, 0, 32, address);
                buf_set_u32(reg_params[2].value, 0, 32, 4*thisrun_count);
-               LOG_WARNING("Algorithm flash write  %i words to 0x%x, %i remaining",thisrun_count,address, wcount);
-               LOG_DEBUG("Algorithm flash write  %i words to 0x%x, %i remaining",thisrun_count,address, wcount);
+               LOG_INFO("Algorithm flash write %i words to 0x%x, %i remaining", thisrun_count, address, wcount);
+               LOG_DEBUG("Algorithm flash write %i words to 0x%x, %i remaining", thisrun_count, address, wcount);
                if ((retval = target->type->run_algorithm(target, 0, NULL, 3, reg_params, write_algorithm->address, write_algorithm->address + sizeof(stellaris_write_code)-10, 10000, &armv7m_info)) != ERROR_OK)
                {
                        LOG_ERROR("error executing stellaris flash write algorithm");
-                       target_free_working_area(target, source);
-                       destroy_reg_param(&reg_params[0]);
-                       destroy_reg_param(&reg_params[1]);
-                       destroy_reg_param(&reg_params[2]);
-                       return ERROR_FLASH_OPERATION_FAILED;
+                       retval = ERROR_FLASH_OPERATION_FAILED;
+                       break;
                }
        
                buffer += thisrun_count * 4;
@@ -805,20 +800,14 @@ int stellaris_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
                wcount -= thisrun_count;
        }
        
-
        target_free_working_area(target, write_algorithm);
        target_free_working_area(target, source);
        
        destroy_reg_param(&reg_params[0]);
        destroy_reg_param(&reg_params[1]);
        destroy_reg_param(&reg_params[2]);
-       destroy_reg_param(&reg_params[3]);
-       destroy_reg_param(&reg_params[4]);
-       destroy_reg_param(&reg_params[5]);
-       destroy_reg_param(&reg_params[6]);
-       destroy_reg_param(&reg_params[7]);
        
-       return ERROR_OK;
+       return retval;
 }
 
 int stellaris_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
@@ -831,6 +820,7 @@ int stellaris_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count
        
        if (bank->target->state != TARGET_HALTED)
        {
+               LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
 
@@ -859,8 +849,7 @@ int stellaris_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count
 
        /* Configure the flash controller timing */     
        stellaris_read_clock_info(bank);        
-       stellaris_set_flash_mode(bank,0);
-
+       stellaris_set_flash_mode(bank, 0);
        
        /* Clear and disable flash programming interrupts */
        target_write_u32(target, FLASH_CIM, 0);
@@ -894,12 +883,12 @@ int stellaris_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count
                        count = 0;
                }
        }
-
-
-
-       while(count>0)
+       
+       while (count > 0)
        {
-               if (!(address&0xff)) LOG_DEBUG("0x%x",address);
+               if (!(address & 0xff))
+                       LOG_DEBUG("0x%x", address);
+               
                /* Program one word */
                target_write_u32(target, FLASH_FMA, address);
                target_write_buffer(target, FLASH_FMD, 4, buffer);
@@ -910,14 +899,14 @@ int stellaris_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count
                {
                        target_read_u32(target, FLASH_FMC, &flash_fmc);
                }
-               while(flash_fmc & FMC_WRITE);
+               while (flash_fmc & FMC_WRITE);
                buffer += 4;
                address += 4;
                count -= 4;
        }
        /* Check acess violations */
        target_read_u32(target, FLASH_CRIS, &flash_cris);
-       if(flash_cris & (AMASK))
+       if (flash_cris & (AMASK))
        {
                LOG_DEBUG("flash_cris 0x%x", flash_cris);
                return ERROR_FLASH_OPERATION_FAILED;
@@ -925,7 +914,6 @@ int stellaris_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count
        return ERROR_OK;
 }
 
-
 int stellaris_probe(struct flash_bank_s *bank)
 {
        /* we can't probe on an stellaris
@@ -934,6 +922,7 @@ int stellaris_probe(struct flash_bank_s *bank)
        
        if (bank->target->state != TARGET_HALTED)
        {
+               LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
 
@@ -948,3 +937,99 @@ int stellaris_auto_probe(struct flash_bank_s *bank)
                return ERROR_OK;
        return stellaris_probe(bank);
 }
+
+int stellaris_mass_erase(struct flash_bank_s *bank)
+{
+       target_t *target = NULL;
+       stellaris_flash_bank_t *stellaris_info = NULL;
+       u32 flash_fmc;
+       
+       stellaris_info = bank->driver_priv;
+       target = bank->target;
+       
+       if (target->state != TARGET_HALTED)
+       {
+               LOG_ERROR("Target not halted");
+               return ERROR_TARGET_NOT_HALTED;
+       }
+       
+       if (stellaris_info->did1 == 0)
+       {
+               stellaris_read_part_info(bank);
+       }
+       
+       if (stellaris_info->did1 == 0)
+       {
+               LOG_WARNING("Cannot identify target as Stellaris");
+               return ERROR_FLASH_OPERATION_FAILED;
+       }
+       
+       /* Configure the flash controller timing */
+       stellaris_read_clock_info(bank);        
+       stellaris_set_flash_mode(bank, 0);
+
+       /* Clear and disable flash programming interrupts */
+       target_write_u32(target, FLASH_CIM, 0);
+       target_write_u32(target, FLASH_MISC, PMISC|AMISC);
+       
+       target_write_u32(target, FLASH_FMA, 0);
+       target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_MERASE);
+       /* Wait until erase complete */
+       do
+       {
+               target_read_u32(target, FLASH_FMC, &flash_fmc);
+       }
+       while (flash_fmc & FMC_MERASE);
+       
+       /* if device has > 128k, then second erase cycle is needed
+        * this is only valid for older devices, but will not hurt */
+       if (stellaris_info->num_pages * stellaris_info->pagesize > 0x20000)
+       {
+               target_write_u32(target, FLASH_FMA, 0x20000);
+               target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_MERASE);
+               /* Wait until erase complete */
+               do
+               {
+                       target_read_u32(target, FLASH_FMC, &flash_fmc);
+               }
+               while (flash_fmc & FMC_MERASE);
+       }
+       
+       return ERROR_OK;
+}
+
+int stellaris_handle_mass_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+{
+       flash_bank_t *bank;
+       int i;
+       
+       if (argc < 1)
+       {
+               command_print(cmd_ctx, "stellaris mass_erase <bank>");
+               return ERROR_OK;        
+       }
+       
+       bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
+       if (!bank)
+       {
+               command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
+               return ERROR_OK;
+       }
+       
+       if (stellaris_mass_erase(bank) == ERROR_OK)
+       {
+               /* set all sectors as erased */
+               for (i = 0; i < bank->num_sectors; i++)
+               {
+                       bank->sectors[i].is_erased = 1;
+               }
+               
+               command_print(cmd_ctx, "stellaris mass erase complete");
+       }
+       else
+       {
+               command_print(cmd_ctx, "stellaris mass erase failed");
+       }
+       
+       return ERROR_OK;
+}

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)