Code Review / openocd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 26902bb)
flash: fm3 mb9bfxx7 mb9bfxx8 support 81/981/2
authorMuranaka Masaki <monaka@users.sf.net>
Thu, 15 Nov 2012 15:17:34 +0000 (15:17 +0000)
committerSpencer Oliver <spen@spen-soft.co.uk>
Fri, 14 Dec 2012 20:48:40 +0000 (20:48 +0000)
Patch submitted by Trac #55

Change-Id: I08b0d79d24fe9108ca0bbfbc9b45c60359b6d180
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/981
Tested-by: jenkins
src/flash/nor/fm3.c patch | blob | history

diff --git a/src/flash/nor/fm3.c b/src/flash/nor/fm3.c
index 224090db8c1f1a6d2570f2a51810b05d956dbf8b..55a2e22be6d9c15d83fdbd6152d3e844aac2a0b3 100644 (file)
--- a/src/flash/nor/fm3.c
+++ b/src/flash/nor/fm3.c
@@ -38,12 +38,17 @@ enum fm3_variant {
        mb9bfxx4,
        mb9bfxx5,
        mb9bfxx6,
        mb9bfxx4,
        mb9bfxx5,
        mb9bfxx6,
+       mb9bfxx7,
+       mb9bfxx8,
+
        mb9afxx1,       /* Flash Type '2' */
        mb9afxx2,
        mb9afxx3,
        mb9afxx4,
        mb9afxx5,
        mb9afxx1,       /* Flash Type '2' */
        mb9afxx2,
        mb9afxx3,
        mb9afxx4,
        mb9afxx5,
-       mb9afxx6
+       mb9afxx6,
+       mb9afxx7,
+       mb9afxx8,
 };
 
 enum fm3_flash_type {
 };
 
 enum fm3_flash_type {
@@ -87,6 +92,12 @@ FLASH_BANK_COMMAND_HANDLER(fm3_flash_bank_command)
        } else if (strcmp(CMD_ARGV[5], "mb9bfxx6.cpu") == 0) {
                fm3_info->variant = mb9bfxx6;
                fm3_info->flashtype = fm3_flash_type1;
        } else if (strcmp(CMD_ARGV[5], "mb9bfxx6.cpu") == 0) {
                fm3_info->variant = mb9bfxx6;
                fm3_info->flashtype = fm3_flash_type1;
+       } else if (strcmp(CMD_ARGV[5], "mb9bfxx7.cpu") == 0) {
+               fm3_info->variant = mb9bfxx7;
+               fm3_info->flashtype = fm3_flash_type1;
+       } else if (strcmp(CMD_ARGV[5], "mb9bfxx8.cpu") == 0) {
+               fm3_info->variant = mb9bfxx8;
+               fm3_info->flashtype = fm3_flash_type1;
        } else if (strcmp(CMD_ARGV[5], "mb9afxx1.cpu") == 0) {  /* Flash type '2' */
                fm3_info->variant = mb9afxx1;
                fm3_info->flashtype = fm3_flash_type2;
        } else if (strcmp(CMD_ARGV[5], "mb9afxx1.cpu") == 0) {  /* Flash type '2' */
                fm3_info->variant = mb9afxx1;
                fm3_info->flashtype = fm3_flash_type2;
@@ -105,6 +116,12 @@ FLASH_BANK_COMMAND_HANDLER(fm3_flash_bank_command)
        } else if (strcmp(CMD_ARGV[5], "mb9afxx6.cpu") == 0) {
                fm3_info->variant = mb9afxx6;
                fm3_info->flashtype = fm3_flash_type2;
        } else if (strcmp(CMD_ARGV[5], "mb9afxx6.cpu") == 0) {
                fm3_info->variant = mb9afxx6;
                fm3_info->flashtype = fm3_flash_type2;
+       } else if (strcmp(CMD_ARGV[5], "mb9afxx7.cpu") == 0) {
+               fm3_info->variant = mb9afxx7;
+               fm3_info->flashtype = fm3_flash_type2;
+       } else if (strcmp(CMD_ARGV[5], "mb9afxx8.cpu") == 0) {
+               fm3_info->variant = mb9afxx8;
+               fm3_info->flashtype = fm3_flash_type2;
        }
 
        /* unknown Flash type */
        }
 
        /* unknown Flash type */
@@ -572,7 +589,22 @@ static int fm3_probe(struct flash_bank *bank)
                return ERROR_TARGET_NOT_HALTED;
        }
 
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       num_pages = 6;                          /* max number of Flash pages for malloc */
+/*
+ -- page-- start -- blocksize - mpu - totalFlash --
+       page0 0x00000   16k
+       page1 0x04000   16k
+       page2 0x08000   96k             ___ fxx3  128k Flash
+       page3 0x20000  128k             ___ fxx4  256k Flash
+       page4 0x40000  128k             ___ fxx5  384k Flash
+       page5 0x60000  128k             ___ fxx6  512k Flash
+-----------------------
+       page6 0x80000  128k
+       page7 0xa0000  128k             ___ fxx7  256k Flash
+       page8 0xc0000  128k
+       page9 0xe0000  128k             ___ fxx8  256k Flash
+ */
+
+       num_pages = 10;                         /* max number of Flash pages for malloc */
        fm3_info->probed = 0;
 
        bank->sectors = malloc(sizeof(struct flash_sector) * num_pages);
        fm3_info->probed = 0;
 
        bank->sectors = malloc(sizeof(struct flash_sector) * num_pages);
@@ -605,10 +637,14 @@ static int fm3_probe(struct flash_bank *bank)
                || (fm3_info->variant == mb9bfxx4)
                || (fm3_info->variant == mb9bfxx5)
                || (fm3_info->variant == mb9bfxx6)
                || (fm3_info->variant == mb9bfxx4)
                || (fm3_info->variant == mb9bfxx5)
                || (fm3_info->variant == mb9bfxx6)
+               || (fm3_info->variant == mb9bfxx7)
+               || (fm3_info->variant == mb9bfxx8)
                || (fm3_info->variant == mb9afxx2)
                || (fm3_info->variant == mb9afxx4)
                || (fm3_info->variant == mb9afxx5)
                || (fm3_info->variant == mb9afxx2)
                || (fm3_info->variant == mb9afxx4)
                || (fm3_info->variant == mb9afxx5)
-               || (fm3_info->variant == mb9afxx6)) {
+               || (fm3_info->variant == mb9afxx6)
+               || (fm3_info->variant == mb9afxx7)
+               || (fm3_info->variant == mb9afxx8)) {
                num_pages = 3;
                bank->size = 128 * 1024; /* bytes */
                bank->num_sectors = num_pages;
                num_pages = 3;
                bank->size = 128 * 1024; /* bytes */
                bank->num_sectors = num_pages;
@@ -622,9 +658,13 @@ static int fm3_probe(struct flash_bank *bank)
        if ((fm3_info->variant == mb9bfxx4)
                || (fm3_info->variant == mb9bfxx5)
                || (fm3_info->variant == mb9bfxx6)
        if ((fm3_info->variant == mb9bfxx4)
                || (fm3_info->variant == mb9bfxx5)
                || (fm3_info->variant == mb9bfxx6)
+               || (fm3_info->variant == mb9bfxx7)
+               || (fm3_info->variant == mb9bfxx8)
                || (fm3_info->variant == mb9afxx4)
                || (fm3_info->variant == mb9afxx5)
                || (fm3_info->variant == mb9afxx4)
                || (fm3_info->variant == mb9afxx5)
-               || (fm3_info->variant == mb9afxx6)) {
+               || (fm3_info->variant == mb9afxx6)
+               || (fm3_info->variant == mb9afxx7)
+               || (fm3_info->variant == mb9afxx8)) {
                num_pages = 4;
                bank->size = 256 * 1024; /* bytes */
                bank->num_sectors = num_pages;
                num_pages = 4;
                bank->size = 256 * 1024; /* bytes */
                bank->num_sectors = num_pages;
@@ -637,8 +677,12 @@ static int fm3_probe(struct flash_bank *bank)
 
        if ((fm3_info->variant == mb9bfxx5)
                || (fm3_info->variant == mb9bfxx6)
 
        if ((fm3_info->variant == mb9bfxx5)
                || (fm3_info->variant == mb9bfxx6)
+               || (fm3_info->variant == mb9bfxx7)
+               || (fm3_info->variant == mb9bfxx8)
                || (fm3_info->variant == mb9afxx5)
                || (fm3_info->variant == mb9afxx5)
-               || (fm3_info->variant == mb9afxx6)) {
+               || (fm3_info->variant == mb9afxx6)
+               || (fm3_info->variant == mb9afxx7)
+               || (fm3_info->variant == mb9afxx8)) {
                num_pages = 5;
                bank->size = 384 * 1024; /* bytes */
                bank->num_sectors = num_pages;
                num_pages = 5;
                bank->size = 384 * 1024; /* bytes */
                bank->num_sectors = num_pages;
@@ -650,7 +694,11 @@ static int fm3_probe(struct flash_bank *bank)
        }
 
        if ((fm3_info->variant == mb9bfxx6)
        }
 
        if ((fm3_info->variant == mb9bfxx6)
-               || (fm3_info->variant == mb9afxx6)) {
+               || (fm3_info->variant == mb9bfxx7)
+               || (fm3_info->variant == mb9bfxx8)
+               || (fm3_info->variant == mb9afxx6)
+               || (fm3_info->variant == mb9afxx7)
+               || (fm3_info->variant == mb9afxx8)) {
                num_pages = 6;
                bank->size = 512 * 1024; /* bytes */
                bank->num_sectors = num_pages;
                num_pages = 6;
                bank->size = 512 * 1024; /* bytes */
                bank->num_sectors = num_pages;
@@ -661,6 +709,42 @@ static int fm3_probe(struct flash_bank *bank)
                bank->sectors[5].is_protected = -1;
        }
 
                bank->sectors[5].is_protected = -1;
        }
 
+       if ((fm3_info->variant == mb9bfxx7)
+               || (fm3_info->variant == mb9bfxx8)
+               || (fm3_info->variant == mb9afxx7)
+               || (fm3_info->variant == mb9afxx8)) {
+               num_pages = 8;
+               bank->size = 768 * 1024; /* bytes */
+               bank->num_sectors = num_pages;
+
+               bank->sectors[6].offset = 0x80000;
+               bank->sectors[6].size = 128 * 1024;
+               bank->sectors[6].is_erased = -1;
+               bank->sectors[6].is_protected = -1;
+
+               bank->sectors[7].offset = 0xa0000;
+               bank->sectors[7].size = 128 * 1024;
+               bank->sectors[7].is_erased = -1;
+               bank->sectors[7].is_protected = -1;
+       }
+
+       if ((fm3_info->variant == mb9bfxx8)
+               || (fm3_info->variant == mb9afxx8)) {
+               num_pages = 10;
+               bank->size = 1024 * 1024; /* bytes */
+               bank->num_sectors = num_pages;
+
+               bank->sectors[8].offset = 0xc0000;
+               bank->sectors[8].size = 128 * 1024;
+               bank->sectors[8].is_erased = -1;
+               bank->sectors[8].is_protected = -1;
+
+               bank->sectors[9].offset = 0xe0000;
+               bank->sectors[9].size = 128 * 1024;
+               bank->sectors[9].is_erased = -1;
+               bank->sectors[9].is_protected = -1;
+       }
+
        fm3_info->probed = 1;
 
        return ERROR_OK;
        fm3_info->probed = 1;
 
        return ERROR_OK;
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)