dos2unix fix.
[openocd.git] / src / flash / stellaris.c
index ec5dc3a429da40d02b70df10886d19e253264f7f..d8bd14e05f2474f8df4353cdf7abe34c983b16a7 100644 (file)
 #include <string.h>
 #include <unistd.h>
 
+#define DID0_VER(did0) ((did0>>28)&0x07)
 int stellaris_register_commands(struct command_context_s *cmd_ctx);
 int stellaris_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);
 int stellaris_erase(struct flash_bank_s *bank, int first, int last);
 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);
 
+int stellaris_read_part_info(struct flash_bank_s *bank);
 u32 stellaris_get_flash_status(flash_bank_t *bank);
 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);
+
 flash_driver_t stellaris_flash =
 {
        .name = "stellaris",
@@ -66,6 +71,7 @@ flash_driver_t stellaris_flash =
        .protect = stellaris_protect,
        .write = stellaris_write,
        .probe = stellaris_probe,
+       .auto_probe = stellaris_auto_probe,
        .erase_check = stellaris_erase_check,
        .protect_check = stellaris_protect_check,
        .info = stellaris_info
@@ -79,57 +85,137 @@ struct {
 {
        {0x01,"LM3S101"},
        {0x02,"LM3S102"},
+       {0x19,"LM3S300"},
        {0x11,"LM3S301"},
        {0x12,"LM3S310"},
+       {0x1A,"LM3S308"},
        {0x13,"LM3S315"},
        {0x14,"LM3S316"},
+       {0x17,"LM3S317"},
+       {0x18,"LM3S318"},
        {0x15,"LM3S328"},
+       {0x2A,"LM3S600"},
        {0x21,"LM3S601"},
+       {0x2B,"LM3S608"},
        {0x22,"LM3S610"},
        {0x23,"LM3S611"},
        {0x24,"LM3S612"},
        {0x25,"LM3S613"},
        {0x26,"LM3S615"},
+       {0x28,"LM3S617"},
+       {0x29,"LM3S618"},
        {0x27,"LM3S628"},
+       {0x38,"LM3S800"},
        {0x31,"LM3S801"},
+       {0x39,"LM3S808"},
        {0x32,"LM3S811"},
        {0x33,"LM3S812"},
        {0x34,"LM3S815"},
+       {0x36,"LM3S817"},
+       {0x37,"LM3S818"},
        {0x35,"LM3S828"},
-    {0x51,"LM3S2110"},
-    {0x84,"LM3S2139"},
-    {0xa2,"LM3S2410"},
-    {0x59,"LM3S2412"},
-    {0x56,"LM3S2432"},
-    {0x5a,"LM3S2533"},
-    {0x57,"LM3S2620"},
-    {0x85,"LM3S2637"},
-    {0x53,"LM3S2651"},
-    {0xa4,"LM3S2730"},
-    {0x52,"LM3S2739"},
-    {0x54,"LM3S2939"},
-    {0x8f,"LM3S2948"},
-    {0x58,"LM3S2950"},
-    {0x55,"LM3S2965"},
-    {0xa1,"LM3S6100"},
-    {0x74,"LM3S6110"},
-    {0xa5,"LM3S6420"},
-    {0x82,"LM3S6422"},
-    {0x75,"LM3S6432"},
-    {0x71,"LM3S6610"},
-    {0x83,"LM3S6633"},
-    {0x8b,"LM3S6637"},
-    {0xa3,"LM3S6730"},
-    {0x89,"LM3S6938"},
-    {0x78,"LM3S6952"},
-    {0x73,"LM3S6965"},
+       {0x51,"LM3S2110"},
+       {0x52,"LM3S2739"},
+       {0x53,"LM3S2651"},
+       {0x54,"LM3S2939"},
+       {0x55,"LM3S2965"},
+       {0x56,"LM3S2432"},
+       {0x57,"LM3S2620"},
+       {0x58,"LM3S2950"},
+       {0x59,"LM3S2412"},
+       {0x5A,"LM3S2533"},
+       {0x61,"LM3S8630"},
+       {0x62,"LM3S8970"},
+       {0x63,"LM3S8730"},
+       {0x64,"LM3S8530"},
+       {0x65,"LM3S8930"},
+       {0x71,"LM3S6610"},
+       {0x72,"LM3S6950"},
+       {0x73,"LM3S6965"},
+       {0x74,"LM3S6110"},
+       {0x75,"LM3S6432"},
+       {0x76,"LM3S6537"},
+       {0x77,"LM3S6753"},
+       {0x78,"LM3S6952"},
+       {0x82,"LM3S6422"},
+       {0x83,"LM3S6633"},
+       {0x84,"LM3S2139"},
+       {0x85,"LM3S2637"},
+       {0x86,"LM3S8738"},
+       {0x88,"LM3S8938"},
+       {0x89,"LM3S6938"},
+       {0x8B,"LM3S6637"},
+       {0x8C,"LM3S8933"},
+       {0x8D,"LM3S8733"},
+       {0x8E,"LM3S8538"},
+       {0x8F,"LM3S2948"},
+       {0xA1,"LM3S6100"},
+       {0xA2,"LM3S2410"},
+       {0xA3,"LM3S6730"},
+       {0xA4,"LM3S2730"},
+       {0xA5,"LM3S6420"},
+       {0xA6,"LM3S8962"},
+       {0xB3,"LM3S1635"},
+       {0xB4,"LM3S1850"},
+       {0xB5,"LM3S1960"},
+       {0xB7,"LM3S1937"},
+       {0xB8,"LM3S1968"},
+       {0xB9,"LM3S1751"},
+       {0xBA,"LM3S1439"},
+       {0xBB,"LM3S1512"},
+       {0xBC,"LM3S1435"},
+       {0xBD,"LM3S1637"},
+       {0xBE,"LM3S1958"},
+       {0xBF,"LM3S1110"},
+       {0xC0,"LM3S1620"},
+       {0xC1,"LM3S1150"},
+       {0xC2,"LM3S1165"},
+       {0xC3,"LM3S1133"},
+       {0xC4,"LM3S1162"},
+       {0xC5,"LM3S1138"},
+       {0xC6,"LM3S1332"},
+       {0xC7,"LM3S1538"},
+       {0xD0,"LM3S6815"},
+       {0xD1,"LM3S6816"},
+       {0xD2,"LM3S6915"},
+       {0xD3,"LM3S6916"},
+       {0xD4,"LM3S2016"},
+       {0xD5,"LM3S1615"},
+       {0xD6,"LM3S1616"},
+       {0xD7,"LM3S8971"},
+       {0xD8,"LM3S1108"},
+       {0xD9,"LM3S1101"},
+       {0xDA,"LM3S1608"},
+       {0xDB,"LM3S1601"},
+       {0xDC,"LM3S1918"},
+       {0xDD,"LM3S1911"},
+       {0xDE,"LM3S2108"},
+       {0xDF,"LM3S2101"},
+       {0xE0,"LM3S2608"},
+       {0xE1,"LM3S2601"},
+       {0xE2,"LM3S2918"},
+       {0xE3,"LM3S2911"},
+       {0xE4,"LM3S6118"},
+       {0xE5,"LM3S6111"},
+       {0xE6,"LM3S6618"},
+       {0xE7,"LM3S6611"},
+       {0xE8,"LM3S6918"},
+       {0xE9,"LM3S6911"},
        {0,"Unknown part"}
 };
 
+char * StellarisClassname[2] =
+{
+       "Sandstorm",
+       "Fury"
+};
+
 /***************************************************************************
 *      openocd command interface                                              *
 ***************************************************************************/
 
+/* flash_bank stellaris <base> <size> 0 0 <target#>
+ */
 int stellaris_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank)
 {
        stellaris_flash_bank_t *stellaris_info;
@@ -144,13 +230,7 @@ int stellaris_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, c
        bank->base = 0x0;
        bank->driver_priv = stellaris_info;
        
-       stellaris_info->target_name ="Unknown target";
-       stellaris_info->target = get_target_by_num(strtoul(args[5], NULL, 0));
-       if (!stellaris_info->target)
-       {
-               ERROR("no target '%i' configured", args[5]);
-               exit(-1);
-       }
+       stellaris_info->target_name = "Unknown target";
        
        /* part wasn't probed for info yet */
        stellaris_info->did1 = 0;
@@ -171,7 +251,7 @@ int stellaris_register_commands(struct command_context_s *cmd_ctx)
 
 int stellaris_info(struct flash_bank_s *bank, char *buf, int buf_size)
 {
-       int printed;
+       int printed, device_class;
        stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
        
        stellaris_read_part_info(bank);
@@ -184,8 +264,16 @@ int stellaris_info(struct flash_bank_s *bank, char *buf, int buf_size)
                return ERROR_FLASH_OPERATION_FAILED;
        }
        
-    printed = snprintf(buf, buf_size, "\nLMI Stellaris information: Chip is class %i %s v%c.%i\n",
-         (stellaris_info->did0>>16)&0xff, stellaris_info->target_name,
+       if (DID0_VER(stellaris_info->did0)>0)
+       {
+               device_class = (stellaris_info->did0>>16)&0xFF;
+       }
+       else
+       {
+               device_class = 0;
+       }       
+    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);
        buf += printed;
        buf_size -= printed;
@@ -213,8 +301,7 @@ int stellaris_info(struct flash_bank_s *bank, char *buf, int buf_size)
 
 u32 stellaris_get_flash_status(flash_bank_t *bank)
 {
-       stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
-       target_t *target = stellaris_info->target;
+       target_t *target = bank->target;
        u32 fmc;
        
        target_read_u32(target, FLASH_CONTROL_BASE|FLASH_FMC, &fmc);
@@ -227,9 +314,9 @@ u32 stellaris_get_flash_status(flash_bank_t *bank)
 void stellaris_read_clock_info(flash_bank_t *bank)
 {
        stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
-       target_t *target = stellaris_info->target;
+       target_t *target = bank->target;
        u32 rcc, pllcfg, sysdiv, usesysdiv, bypass, oscsrc;
-       unsigned long tmp, mainfreq;
+       unsigned long mainfreq;
 
        target_read_u32(target, SCB_BASE|RCC, &rcc);
        DEBUG("Stellaris RCC %x",rcc);
@@ -275,7 +362,7 @@ void stellaris_read_clock_info(flash_bank_t *bank)
 void stellaris_set_flash_mode(flash_bank_t *bank,int mode)
 {
        stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
-       target_t *target = stellaris_info->target;
+       target_t *target = bank->target;
 
        u32 usecrl = (stellaris_info->mck_freq/1000000ul-1);
        DEBUG("usecrl = %i",usecrl);    
@@ -304,8 +391,8 @@ u32 stellaris_wait_status_busy(flash_bank_t *bank, u32 waitbits, int timeout)
 int stellaris_flash_command(struct flash_bank_s *bank,u8 cmd,u16 pagen) 
 {
        u32 fmc;
-       stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
-       target_t *target = stellaris_info->target;
+//     stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
+       target_t *target = bank->target;
 
        fmc = FMC_WRKEY | cmd; 
        target_write_u32(target, FLASH_CONTROL_BASE|FLASH_FMC, fmc);
@@ -323,7 +410,7 @@ int stellaris_flash_command(struct flash_bank_s *bank,u8 cmd,u16 pagen)
 int stellaris_read_part_info(struct flash_bank_s *bank)
 {
        stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
-       target_t *target = stellaris_info->target;
+       target_t *target = bank->target;
     u32 did0,did1, ver, fam, status;
        int i;
        
@@ -338,8 +425,7 @@ int stellaris_read_part_info(struct flash_bank_s *bank)
     if((ver != 0) && (ver != 1))
        {
         WARNING("Unknown did0 version, cannot identify target");
-               return ERROR_FLASH_OPERATION_FAILED;
-       
+               return ERROR_FLASH_OPERATION_FAILED;    
        }
 
     ver = did1 >> 28;
@@ -365,7 +451,7 @@ 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->pagesize = 1024;
@@ -378,8 +464,6 @@ int stellaris_read_part_info(struct flash_bank_s *bank)
        
        status = stellaris_get_flash_status(bank);
        
-       WARNING("stellaris flash only tested for LM3S811 series");
-       
        return ERROR_OK;
 }
 
@@ -389,11 +473,13 @@ int stellaris_read_part_info(struct flash_bank_s *bank)
 
 int stellaris_erase_check(struct flash_bank_s *bank)
 {
+       /* 
+       
        stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
-       target_t *target = stellaris_info->target;
+       target_t *target = bank->target;
        int i;
        
-       /* */
+       */
        
        return ERROR_OK;
 }
@@ -403,7 +489,6 @@ int stellaris_protect_check(struct flash_bank_s *bank)
        u32 status;
        
        stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
-       target_t *target = stellaris_info->target;
 
        if (stellaris_info->did1 == 0)
        {
@@ -427,12 +512,7 @@ int stellaris_erase(struct flash_bank_s *bank, int first, int last)
        int banknr;
        u32 flash_fmc, flash_cris;
        stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
-       target_t *target = stellaris_info->target;
-       
-       if (stellaris_info->target->state != TARGET_HALTED)
-       {
-               return ERROR_TARGET_NOT_HALTED;
-       }
+       target_t *target = bank->target;
        
        if (stellaris_info->did1 == 0)
        {
@@ -513,13 +593,13 @@ int stellaris_erase(struct flash_bank_s *bank, int first, int last)
 
 int stellaris_protect(struct flash_bank_s *bank, int set, int first, int last)
 {
-       u32 cmd, fmppe, flash_fmc, flash_cris;
+       u32 fmppe, flash_fmc, flash_cris;
        int lockregion;
        
        stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
-       target_t *target = stellaris_info->target;
+       target_t *target = bank->target;
        
-       if (stellaris_info->target->state != TARGET_HALTED)
+       if (bank->target->state != TARGET_HALTED)
        {
                return ERROR_TARGET_NOT_HALTED;
        }
@@ -588,15 +668,18 @@ int stellaris_protect(struct flash_bank_s *bank, int set, int first, int last)
 
 u8 stellaris_write_code[] = 
 {
-/* Call with : 
+/* 
+       Call with :     
        r0 = buffer address
        r1 = destination address
        r2 = bytecount (in) - endaddr (work) 
+       
+       Used registers: 
        r3 = pFLASH_CTRL_BASE
        r4 = FLASHWRITECMD
        r5 = #1
-       r6 = scratch
-       r7
+       r6 = bytes written
+       r7 = temp reg
 */
        0x07,0x4B,              /* ldr r3,pFLASH_CTRL_BASE */
        0x08,0x4C,              /* ldr r4,FLASHWRITECMD */
@@ -624,8 +707,8 @@ u8 stellaris_write_code[] =
 
 int stellaris_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 wcount)
 {
-       stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
-       target_t *target = stellaris_info->target;
+//     stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
+       target_t *target = bank->target;
        u32 buffer_size = 8192;
        working_area_t *source;
        working_area_t *write_algorithm;
@@ -634,8 +717,8 @@ int stellaris_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
        armv7m_algorithm_t armv7m_info;
        int retval;
        
-    DEBUG("(bank=%08X buffer=%08X offset=%08X wcount=%08X)",
-                                  bank, buffer, offset, wcount);
+       DEBUG("(bank=%08X buffer=%08X offset=%08X wcount=%08X)",
+                       (unsigned int)bank, (unsigned int)buffer, offset, wcount);
 
        /* flash write code */
        if (target_alloc_working_area(target, sizeof(stellaris_write_code), &write_algorithm) != ERROR_OK)
@@ -649,8 +732,8 @@ int stellaris_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
        /* memory buffer */
        while (target_alloc_working_area(target, buffer_size, &source) != ERROR_OK)
        {
-        DEBUG("called target_alloc_working_area(target=%08X buffer_size=%08X source=%08X)",
-                             target, buffer_size, source); 
+               DEBUG("called target_alloc_working_area(target=%08X buffer_size=%08X source=%08X)",
+                               (unsigned int)target, buffer_size, (unsigned int)source); 
                buffer_size /= 2;
                if (buffer_size <= 256)
                {
@@ -721,20 +804,14 @@ int stellaris_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32
 int stellaris_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
 {
        stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
-       target_t *target = stellaris_info->target;
-       u32 dst_min_alignment, wcount, bytes_remaining = count;
+       target_t *target = bank->target;
        u32 address = offset;
-       u32 fcr,flash_cris,flash_fmc;
+       u32 flash_cris,flash_fmc;
        u32 retval;
        
-    DEBUG("(bank=%08X buffer=%08X offset=%08X count=%08X)",
-                            bank, buffer, offset, count);
+       DEBUG("(bank=%08X buffer=%08X offset=%08X count=%08X)",
+                       (unsigned int)bank, (unsigned int)buffer, offset, count);
 
-       if (stellaris_info->target->state != TARGET_HALTED)
-       {
-               return ERROR_TARGET_NOT_HALTED;
-       }
-       
        if (stellaris_info->did1 == 0)
        {
                stellaris_read_part_info(bank);
@@ -831,6 +908,8 @@ int stellaris_probe(struct flash_bank_s *bank)
         */
        stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
        
+       stellaris_info->probed = 0;
+       
        if (stellaris_info->did1 == 0)
        {
                stellaris_read_part_info(bank);
@@ -842,5 +921,15 @@ int stellaris_probe(struct flash_bank_s *bank)
                return ERROR_FLASH_OPERATION_FAILED;
        }
        
+       stellaris_info->probed = 1;
+       
        return ERROR_OK;
 }
+
+int stellaris_auto_probe(struct flash_bank_s *bank)
+{
+       stellaris_flash_bank_t *stellaris_info = bank->driver_priv;
+       if (stellaris_info->probed)
+               return ERROR_OK;
+       return stellaris_probe(bank);
+}

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)