Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
flash/nor/stellaris: add all Tiva C parts IDs
[openocd.git] / src / flash / nor / stellaris.c
diff --git a/src/flash/nor/stellaris.c b/src/flash/nor/stellaris.c
index 7665ab38a9611479d720091d9b18fa2276dd9544..08af1928e08223c0ad025d7a92709f98f6cc9298 100644 (file)
--- a/src/flash/nor/stellaris.c
+++ b/src/flash/nor/stellaris.c
@@ -69,6 +69,8 @@
 #define FLASH_CRIS     (FLASH_CONTROL_BASE | 0x00C)
 #define FLASH_CIM      (FLASH_CONTROL_BASE | 0x010)
 #define FLASH_MISC     (FLASH_CONTROL_BASE | 0x014)
+#define FLASH_FSIZE    (FLASH_CONTROL_BASE | 0xFC0)
+#define FLASH_SSIZE    (FLASH_CONTROL_BASE | 0xFC4)
 
 #define AMISC  1
 #define PMISC  2
@@ -98,6 +100,8 @@ struct stellaris_flash_bank {
        uint32_t did1;
        uint32_t dc0;
        uint32_t dc1;
+       uint32_t fsize;
+       uint32_t ssize;
 
        const char *target_name;
        uint8_t target_class;
@@ -361,70 +365,96 @@ static const struct {
        {0x06, 0x7D, "LM3S9U90"},
        {0x06, 0x90, "LM3S9U92"},
        {0x06, 0x9B, "LM3S9U96"},
-       {0x05, 0x18, "LM4F110B2QR"},
-       {0x05, 0x19, "LM4F110C4QR"},
-       {0x05, 0x10, "LM4F110E5QR"},
-       {0x05, 0x11, "LM4F110H5QR"},
-       {0x05, 0x22, "LM4F111B2QR"},
-       {0x05, 0x23, "LM4F111C4QR"},
-       {0x05, 0x20, "LM4F111E5QR"},
-       {0x05, 0x21, "LM4F111H5QR"},
-       {0x05, 0x36, "LM4F112C4QC"},
-       {0x05, 0x30, "LM4F112E5QC"},
-       {0x05, 0x31, "LM4F112H5QC"},
-       {0x05, 0x35, "LM4F112H5QD"},
-       {0x05, 0x01, "LM4F120B2QR"},
-       {0x05, 0x02, "LM4F120C4QR"},
-       {0x05, 0x03, "LM4F120E5QR"},
-       {0x05, 0x04, "LM4F120H5QR"},
-       {0x05, 0x08, "LM4F121B2QR"},
-       {0x05, 0x09, "LM4F121C4QR"},
-       {0x05, 0x0A, "LM4F121E5QR"},
-       {0x05, 0x0B, "LM4F121H5QR"},
-       {0x05, 0xD0, "LM4F122C4QC"},
-       {0x05, 0xD1, "LM4F122E5QC"},
-       {0x05, 0xD2, "LM4F122H5QC"},
-       {0x05, 0xD6, "LM4F122H5QD"},
-       {0x05, 0x48, "LM4F130C4QR"},
-       {0x05, 0x40, "LM4F130E5QR"},
-       {0x05, 0x41, "LM4F130H5QR"},
-       {0x05, 0x52, "LM4F131C4QR"},
-       {0x05, 0x50, "LM4F131E5QR"},
-       {0x05, 0x51, "LM4F131H5QR"},
-       {0x05, 0x66, "LM4F132C4QC"},
-       {0x05, 0x60, "LM4F132E5QC"},
-       {0x05, 0x61, "LM4F132H5QC"},
-       {0x05, 0x65, "LM4F132H5QD"},
-       {0x05, 0x70, "LM4F210E5QR"},
-       {0x05, 0x73, "LM4F210H5QR"},
-       {0x05, 0x80, "LM4F211E5QR"},
-       {0x05, 0x83, "LM4F211H5QR"},
-       {0x05, 0xE9, "LM4F212H5BB"},
-       {0x05, 0xC4, "LM4F212H5QC"},
-       {0x05, 0xC6, "LM4F212H5QD"},
-       {0x05, 0xA0, "LM4F230E5QR"},
-       {0x05, 0xA1, "LM4F230H5QR"},
-       {0x05, 0xB0, "LM4F231E5QR"},
-       {0x05, 0xB1, "LM4F231H5QR"},
-       {0x05, 0xC0, "LM4F232E5QC"},
-       {0x05, 0xE3, "LM4F232H5BB"},
-       {0x05, 0xC1, "LM4F232H5QC"},
-       {0x05, 0xC5, "LM4F232H5QD"},
+       {0x05, 0x01, "LM4F120B2QR/TM4C1233C3PM"},
+       {0x05, 0x02, "LM4F120C4QR/TM4C1233D5PM"},
+       {0x05, 0x03, "LM4F120E5QR/TM4C1233E6PM"},
+       {0x05, 0x04, "LM4F120H5QR/TM4C1233H6PM"},
+       {0x05, 0x08, "LM4F121B2QR/TM4C1232C3PM"},
+       {0x05, 0x09, "LM4F121C4QR/TM4C1232D5PM"},
+       {0x05, 0x0A, "LM4F121E5QR/TM4C1232E6PM"},
+       {0x05, 0x0B, "LM4F121H5QR/TM4C1232H6PM"},
+       {0x05, 0x10, "LM4F110E5QR/TM4C1231E6PM"},
+       {0x05, 0x11, "LM4F110H5QR/TM4C1231H6PM"},
+       {0x05, 0x18, "LM4F110B2QR/TM4C1231C3PM"},
+       {0x05, 0x19, "LM4F110C4QR/TM4C1231D5PM"},
+       {0x05, 0x20, "LM4F111E5QR/TM4C1230E6PM"},
+       {0x05, 0x21, "LM4F111H5QR/TM4C1230H6PM"},
+       {0x05, 0x22, "LM4F111B2QR/TM4C1230C3PM"},
+       {0x05, 0x23, "LM4F111C4QR/TM4C1230D5PM"},
+       {0x05, 0x30, "LM4F112E5QC/TM4C1231E6PZ"},
+       {0x05, 0x31, "LM4F112H5QC/TM4C1231H6PZ"},
+       {0x05, 0x35, "LM4F112H5QD/TM4C1231H6PGE"},
+       {0x05, 0x36, "LM4F112C4QC/TM4C1231D5PZ"},
+       {0x05, 0x40, "LM4F130E5QR/TM4C1237E6PM"},
+       {0x05, 0x41, "LM4F130H5QR/TM4C1237H6PM"},
+       {0x05, 0x48, "LM4F130C4QR/TM4C1237D5PM"},
+       {0x05, 0x50, "LM4F131E5QR/TM4C1236E6PM"},
+       {0x05, 0x51, "LM4F131H5QR/TM4C1236H6PM"},
+       {0x05, 0x52, "LM4F131C4QR/TM4C1236D5PM"},
+       {0x05, 0x60, "LM4F132E5QC/TM4C1237E6PZ"},
+       {0x05, 0x61, "LM4F132H5QC/TM4C1237H6PZ"},
+       {0x05, 0x65, "LM4F132H5QD/TM4C1237H6PGE"},
+       {0x05, 0x66, "LM4F132C4QC/TM4C1237D5PZ"},
+       {0x05, 0x70, "LM4F210E5QR/TM4C123BE6PM"},
+       {0x05, 0x73, "LM4F210H5QR/TM4C123BH6PM"},
+       {0x05, 0x80, "LM4F211E5QR/TM4C123AE6PM"},
+       {0x05, 0x83, "LM4F211H5QR/TM4C123AH6PM"},
+       {0x05, 0xA0, "LM4F230E5QR/TM4C123GE6PM"},
+       {0x05, 0xA1, "LM4F230H5QR/TM4C123GH6PM"},
+       {0x05, 0xB0, "LM4F231E5QR/TM4C123FE6PM"},
+       {0x05, 0xB1, "LM4F231H5QR/TM4C123FH6PM"},
+       {0x05, 0xC0, "LM4F232E5QC/TM4C123GE6PZ"},
+       {0x05, 0xC1, "LM4F232H5QC/TM4C123GH6PZ"},
+       {0x05, 0xC3, "LM4F212E5QC/TM4C123BE6PZ"},
+       {0x05, 0xC4, "LM4F212H5QC/TM4C123BH6PZ"},
+       {0x05, 0xC5, "LM4F232H5QD/TM4C123GH6PGE"},
+       {0x05, 0xC6, "LM4F212H5QD/TM4C123BH6PGE"},
+       {0x05, 0xD0, "LM4F122C4QC/TM4C1233D5PZ"},
+       {0x05, 0xD1, "LM4F122E5QC/TM4C1233E6PZ"},
+       {0x05, 0xD2, "LM4F122H5QC/TM4C1233H6PZ"},
+       {0x05, 0xD6, "LM4F122H5QD/TM4C1233H6PGE"},
+       {0x05, 0xE1, "LM4FSXLH5BB"},
+       {0x05, 0xE3, "LM4F232H5BB/TM4C123GH6ZRB"},
+       {0x05, 0xE4, "LM4FS99H5BB"},
        {0x05, 0xE5, "LM4FS1AH5BB"},
+       {0x05, 0xE9, "LM4F212H5BB/TM4C123BH6ZRB"},
        {0x05, 0xEA, "LM4FS1GH5BB"},
-       {0x05, 0xE4, "LM4FS99H5BB"},
-       {0x05, 0xE1, "LM4FSXLH5BB"},
+       {0x05, 0xF0, "TM4C123GH6ZXR"},
+       {0x0A, 0x19, "TM4C1290NCPDT"},
+       {0x0A, 0x1B, "TM4C1290NCZAD"},
+       {0x0A, 0x1C, "TM4C1292NCPDT"},
+       {0x0A, 0x1E, "TM4C1292NCZAD"},
+       {0x0A, 0x1F, "TM4C1294NCPDT"},
+       {0x0A, 0x21, "TM4C1294NCZAD"},
+       {0x0A, 0x22, "TM4C1297NCZAD"},
+       {0x0A, 0x23, "TM4C1299NCZAD"},
+       {0x0A, 0x24, "TM4C129CNCPDT"},
+       {0x0A, 0x26, "TM4C129CNCZAD"},
+       {0x0A, 0x27, "TM4C129DNCPDT"},
+       {0x0A, 0x29, "TM4C129DNCZAD"},
+       {0x0A, 0x2D, "TM4C129ENCPDT"},
+       {0x0A, 0x2F, "TM4C129ENCZAD"},
+       {0x0A, 0x30, "TM4C129LNCZAD"},
+       {0x0A, 0x32, "TM4C129XNCZAD"},
+       {0x0A, 0x34, "TM4C1294KCPDT"},
+       {0x0A, 0x35, "TM4C129EKCPDT"},
+       {0x0A, 0x36, "TM4C1299KCZAD"},
+       {0x0A, 0x37, "TM4C129XKCZAD"},
        {0xFF, 0x00, "Unknown Part"}
 };
 
-static const char *StellarisClassname[7] = {
+static const char * const StellarisClassname[] = {
        "Sandstorm",
        "Fury",
        "Unknown",
        "DustDevil",
        "Tempest",
-       "Blizzard",
-       "Firestorm"
+       "Blizzard/TM4C123x",
+       "Firestorm",
+       "",
+       "",
+       "",
+       "Snowflake",
 };
 
 /***************************************************************************
@@ -486,8 +516,8 @@ static int get_stellaris_info(struct flash_bank *bank, char *buf, int buf_size)
                           stellaris_info->did1,
                           stellaris_info->did1,
                           "ARMv7M",
-                          (int)((1 + ((stellaris_info->dc0 >> 16) & 0xFFFF))/4),
-                          (int)((1 + (stellaris_info->dc0 & 0xFFFF))*2));
+                          stellaris_info->sramsiz,
+                          stellaris_info->num_pages * stellaris_info->pagesize / 1024);
        buf += printed;
        buf_size -= printed;
 
@@ -666,7 +696,7 @@ static int stellaris_read_part_info(struct flash_bank *bank)
        LOG_DEBUG("did0 0x%" PRIx32 ", did1 0x%" PRIx32 ", dc0 0x%" PRIx32 ", dc1 0x%" PRIx32 "",
                  did0, did1, stellaris_info->dc0, stellaris_info->dc1);
 
-       ver = did0 >> 28;
+       ver = DID0_VER(did0);
        if ((ver != 0) && (ver != 1)) {
                LOG_WARNING("Unknown did0 version, cannot identify target");
                return ERROR_FLASH_OPERATION_FAILED;
@@ -724,6 +754,7 @@ static int stellaris_read_part_info(struct flash_bank *bank)
                case 4:                 /* Tempest */
                case 5:                 /* Blizzard */
                case 6:                 /* Firestorm */
+               case 0xa:               /* Snowflake */
                        stellaris_info->iosc_freq = 16000000;   /* +/- 1% */
                        stellaris_info->iosc_desc = " (±1%)";
                        /* FALL THROUGH */
@@ -747,10 +778,34 @@ static int stellaris_read_part_info(struct flash_bank *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;
-       stellaris_info->pages_in_lockregion = 2;
+       if (stellaris_info->target_class == 5) { /* Blizzard */
+               target_read_u32(target, FLASH_FSIZE, &stellaris_info->fsize);
+               target_read_u32(target, FLASH_SSIZE, &stellaris_info->ssize);
+
+               stellaris_info->num_lockbits = 1 + (stellaris_info->fsize & 0xFFFF);
+               stellaris_info->num_pages = 2 * (1 + (stellaris_info->fsize & 0xFFFF));
+               stellaris_info->sramsiz = (1 + (stellaris_info->ssize & 0xFFFF)) / 4;
+               stellaris_info->pagesize = 1024;
+               stellaris_info->pages_in_lockregion = 2;
+       } else if (stellaris_info->target_class == 0xa) { /* Snowflake */
+               target_read_u32(target, FLASH_FSIZE, &stellaris_info->fsize);
+               target_read_u32(target, FLASH_SSIZE, &stellaris_info->ssize);
+
+               stellaris_info->pagesize = (1 << ((stellaris_info->fsize >> 16) & 7)) * 1024;
+               stellaris_info->num_pages = 2048 * (1 + (stellaris_info->fsize & 0xFFFF)) /
+                       stellaris_info->pagesize;
+               stellaris_info->pages_in_lockregion = 1;
+
+               stellaris_info->num_lockbits = stellaris_info->pagesize * stellaris_info->num_pages /
+                       2048;
+               stellaris_info->sramsiz = (1 + (stellaris_info->ssize & 0xFFFF)) / 4;
+       } else {
+               stellaris_info->num_lockbits = 1 + (stellaris_info->dc0 & 0xFFFF);
+               stellaris_info->num_pages = 2 * (1 + (stellaris_info->dc0 & 0xFFFF));
+               stellaris_info->sramsiz = (1 + ((stellaris_info->dc0 >> 16) & 0xFFFF)) / 4;
+               stellaris_info->pagesize = 1024;
+               stellaris_info->pages_in_lockregion = 2;
+       }
 
        /* REVISIT for at least Tempest parts, read NVMSTAT.FWB too.
         * That exposes a 32-word Flash Write Buffer ... enabling
@@ -774,6 +829,11 @@ static int stellaris_protect_check(struct flash_bank *bank)
        if (stellaris->did1 == 0)
                return ERROR_FLASH_BANK_NOT_PROBED;
 
+       if (stellaris->target_class == 0xa) {
+               LOG_WARNING("Assuming flash to be unprotected on Snowflake");
+               return ERROR_OK;
+       }
+
        for (i = 0; i < (unsigned) bank->num_sectors; i++)
                bank->sectors[i].is_protected = -1;
 
@@ -890,6 +950,11 @@ static int stellaris_protect(struct flash_bank *bank, int set, int first, int la
        if (stellaris_info->did1 == 0)
                return ERROR_FLASH_BANK_NOT_PROBED;
 
+       if (stellaris_info->target_class == 0xa) {
+               LOG_ERROR("Protection on Snowflake is not supported yet");
+               return ERROR_FLASH_OPERATION_FAILED;
+       }
+
        /* lockregions are 2 pages ... must protect [even..odd] */
        if ((first < 0) || (first & 1)
                        || (last < first) || !(last & 1)
@@ -1216,7 +1281,7 @@ static int stellaris_probe(struct flash_bank *bank)
        }
 
        /* provide this for the benefit of the NOR flash framework */
-       bank->size = 1024 * stellaris_info->num_pages;
+       bank->size = stellaris_info->num_pages * stellaris_info->pagesize;
        bank->num_sectors = stellaris_info->num_pages;
        bank->sectors = calloc(bank->num_sectors, sizeof(struct flash_sector));
        for (int i = 0; i < bank->num_sectors; i++) {
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)