Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Pavel Chromy cleaned up checks for halted, error messages, etc.
[openocd.git] / src / flash / str9x.c
diff --git a/src/flash/str9x.c b/src/flash/str9x.c
index fcbca89bbbf156c259c16c46f5dcef5a8570fde6..00095a013572484991bcb587e2da14cb8e815343 100644 (file)
--- a/src/flash/str9x.c
+++ b/src/flash/str9x.c
@@ -36,7 +36,7 @@
 #include <string.h>
 #include <unistd.h>
 
-str9x_mem_layout_t mem_layout_str9[] = {
+str9x_mem_layout_t mem_layout_str9bank0[] = {
        {0x00000000, 0x10000, 0x01},
        {0x00010000, 0x10000, 0x02},
        {0x00020000, 0x10000, 0x04},
@@ -45,12 +45,17 @@ str9x_mem_layout_t mem_layout_str9[] = {
        {0x00050000, 0x10000, 0x20},
        {0x00060000, 0x10000, 0x40},
        {0x00070000, 0x10000, 0x80},
-       {0x00080000, 0x02000, 0x100},
-       {0x00082000, 0x02000, 0x200},
-       {0x00084000, 0x02000, 0x400},
-       {0x00086000, 0x02000, 0x800}
 };
 
+str9x_mem_layout_t mem_layout_str9bank1[] = {
+       {0x00000000, 0x02000, 0x100},
+       {0x00002000, 0x02000, 0x200},
+       {0x00004000, 0x02000, 0x400},
+       {0x00006000, 0x02000, 0x800}
+};
+
+static u32 bank1start = 0x00080000;
+
 int str9x_register_commands(struct command_context_s *cmd_ctx);
 int str9x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);
 int str9x_erase(struct flash_bank_s *bank, int first, int last);
@@ -73,6 +78,7 @@ flash_driver_t str9x_flash =
        .protect = str9x_protect,
        .write = str9x_write,
        .probe = str9x_probe,
+       .auto_probe = str9x_probe,
        .erase_check = str9x_erase_check,
        .protect_check = str9x_protect_check,
        .info = str9x_info
@@ -93,22 +99,27 @@ int str9x_build_block_list(struct flash_bank_s *bank)
        str9x_flash_bank_t *str9x_info = bank->driver_priv;
        
        int i;
-       int num_sectors = 0, b0_sectors = 0;
+       int num_sectors = 0;
+       int b0_sectors = 0, b1_sectors = 0;
                
        switch (bank->size)
        {
-               case 256 * 1024:
+               case (256 * 1024):
                        b0_sectors = 4;
                        break;
-               case 512 * 1024:
+               case (512 * 1024):
                        b0_sectors = 8;
                        break;
+               case (32 * 1024):
+                       b1_sectors = 4;
+                       bank1start = bank->base;
+                       break;
                default:
                        ERROR("BUG: unknown bank->size encountered");
                        exit(-1);
        }
-       
-       num_sectors = b0_sectors + 4;
+               
+       num_sectors = b0_sectors + b1_sectors;
        
        bank->num_sectors = num_sectors;
        bank->sectors = malloc(sizeof(flash_sector_t) * num_sectors);
@@ -118,20 +129,20 @@ int str9x_build_block_list(struct flash_bank_s *bank)
        
        for (i = 0; i < b0_sectors; i++)
        {
-               bank->sectors[num_sectors].offset = mem_layout_str9[i].sector_start;
-               bank->sectors[num_sectors].size = mem_layout_str9[i].sector_size;
+               bank->sectors[num_sectors].offset = mem_layout_str9bank0[i].sector_start;
+               bank->sectors[num_sectors].size = mem_layout_str9bank0[i].sector_size;
                bank->sectors[num_sectors].is_erased = -1;
                bank->sectors[num_sectors].is_protected = 1;
-               str9x_info->sector_bits[num_sectors++] = mem_layout_str9[i].sector_bit;
+               str9x_info->sector_bits[num_sectors++] = mem_layout_str9bank0[i].sector_bit;
        }
-       
-       for (i = 8; i < 12; i++)
+
+       for (i = 0; i < b1_sectors; i++)
        {
-               bank->sectors[num_sectors].offset = mem_layout_str9[i].sector_start;
-               bank->sectors[num_sectors].size = mem_layout_str9[i].sector_size;
+               bank->sectors[num_sectors].offset = mem_layout_str9bank1[i].sector_start;
+               bank->sectors[num_sectors].size = mem_layout_str9bank1[i].sector_size;
                bank->sectors[num_sectors].is_erased = -1;
                bank->sectors[num_sectors].is_protected = 1;
-               str9x_info->sector_bits[num_sectors++] = mem_layout_str9[i].sector_bit;
+               str9x_info->sector_bits[num_sectors++] = mem_layout_str9bank1[i].sector_bit;
        }
        
        return ERROR_OK;
@@ -152,12 +163,6 @@ int str9x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char
        str9x_info = malloc(sizeof(str9x_flash_bank_t));
        bank->driver_priv = str9x_info;
        
-       if (bank->base != 0x00000000)
-       {
-               WARNING("overriding flash base address for STR91x device with 0x00000000");
-               bank->base = 0x00000000;
-       }
-
        str9x_build_block_list(bank);
        
        str9x_info->write_algorithm = NULL;
@@ -219,11 +224,11 @@ int str9x_protect_check(struct flash_bank_s *bank)
 
        /* read level one protection */
        
-       adr = mem_layout_str9[10].sector_start + 4;
+       adr = bank1start + 0x10;
        
-       target_write_u32(target, adr, 0x90);
+       target_write_u16(target, adr, 0x90);
        target_read_u16(target, adr, &status);
-       target_write_u32(target, adr, 0xFF);
+       target_write_u16(target, adr, 0xFF);
        
        for (i = 0; i < bank->num_sectors; i++)
        {
@@ -247,12 +252,12 @@ int str9x_erase(struct flash_bank_s *bank, int first, int last)
        {
                return ERROR_TARGET_NOT_HALTED;
        }
-    
+
        for (i = first; i <= last; i++)
        {
-               adr = bank->sectors[i].offset;
+               adr = bank->base + bank->sectors[i].offset;
                
-       /* erase sectors */
+               /* erase sectors */
                target_write_u16(target, adr, 0x20);
                target_write_u16(target, adr, 0xD0);
                
@@ -301,7 +306,7 @@ int str9x_protect(struct flash_bank_s *bank, int set, int first, int last)
        {
                /* Level One Protection */
        
-               adr = bank->sectors[i].offset;
+               adr = bank->base + bank->sectors[i].offset;
                
                target_write_u16(target, adr, 0x60);
                if( set )
@@ -441,7 +446,7 @@ int str9x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
        {
                return ERROR_TARGET_NOT_HALTED;
        }
-       
+
        if (offset & 0x1)
        {
                WARNING("offset 0x%x breaks required 2-byte alignment", offset);
@@ -593,14 +598,20 @@ int str9x_handle_flash_config_command(struct command_context_s *cmd_ctx, char *c
        flash_bank_t *bank;
        target_t *target = NULL;
        
-       if (argc < 4)
+       if (argc < 5)
        {
-               command_print(cmd_ctx, "usage: str9x flash_config <b0size> <b1size> <b0start> <b1start>");
+               return ERROR_COMMAND_SYNTAX_ERROR;
+       }
+       
+       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;
        }
        
-       bank = get_flash_bank_by_num(0);
        str9x_info = bank->driver_priv;
+       
        target = bank->target;
        
        if (bank->target->state != TARGET_HALTED)
@@ -609,12 +620,12 @@ int str9x_handle_flash_config_command(struct command_context_s *cmd_ctx, char *c
        }
        
        /* config flash controller */
-       target_write_u32(target, FLASH_BBSR, strtoul(args[0], NULL, 0));
-       target_write_u32(target, FLASH_NBBSR, strtoul(args[1], NULL, 0));
-       target_write_u32(target, FLASH_BBADR, (strtoul(args[2], NULL, 0) >> 2));
-       target_write_u32(target, FLASH_NBBADR, (strtoul(args[3], NULL, 0) >> 2));
+       target_write_u32(target, FLASH_BBSR, strtoul(args[1], NULL, 0));
+       target_write_u32(target, FLASH_NBBSR, strtoul(args[2], NULL, 0));
+       target_write_u32(target, FLASH_BBADR, (strtoul(args[3], NULL, 0) >> 2));
+       target_write_u32(target, FLASH_NBBADR, (strtoul(args[4], NULL, 0) >> 2));
 
-       /* set b18 instruction TCM order as per flash programming manual */
+       /* set bit 18 instruction TCM order as per flash programming manual */
        arm966e_write_cp15(target, 62, 0x40000);
        
        /* enable flash bank 1 */
Open On-Chip Debugger

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)