Code Review / openocd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 19df456)
nrf51: show proper part number 33/3733/2
authorJiří Pinkava <j-pi@seznam.cz>
Fri, 9 Sep 2016 11:22:59 +0000 (13:22 +0200)
committerFreddie Chopin <freddie.chopin@gmail.com>
Fri, 4 Nov 2016 21:10:18 +0000 (21:10 +0000)
Change-Id: I3e8169eb577888ee54541a1e864a8ad5a9a7cfd1
Signed-off-by: Jiří Pinkava <j-pi@seznam.cz>
Reviewed-on: http://openocd.zylin.com/3733
Tested-by: jenkins
Reviewed-by: Fredrik Hederstierna <fredrik@hederstierna.com>
Reviewed-by: Michael Dietz <mjdietzx@gmail.com>
Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
src/flash/nor/nrf51.c patch | blob | history

diff --git a/src/flash/nor/nrf51.c b/src/flash/nor/nrf51.c
index 60f6d3c6bb21e0a58a9eec8a0a2615bf231725f6..a41bc0598730ebafd1ae5c7d14af6979a96d3b05 100644 (file)
--- a/src/flash/nor/nrf51.c
+++ b/src/flash/nor/nrf51.c
@@ -120,6 +120,7 @@ struct nrf51_info {
 
 struct nrf51_device_spec {
        uint16_t hwid;
 
 struct nrf51_device_spec {
        uint16_t hwid;
+       const char *part;
        const char *variant;
        const char *build_code;
        unsigned int flash_size_kb;
        const char *variant;
        const char *build_code;
        unsigned int flash_size_kb;
@@ -141,30 +142,35 @@ static const struct nrf51_device_spec nrf51_known_devices_table[] = {
        /* nRF51822 Devices (IC rev 1). */
        {
                .hwid           = 0x001D,
        /* nRF51822 Devices (IC rev 1). */
        {
                .hwid           = 0x001D,
+               .part           = "51822",
                .variant        = "QFAA",
                .build_code     = "CA/C0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0026,
                .variant        = "QFAA",
                .build_code     = "CA/C0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0026,
+               .part           = "51822",
                .variant        = "QFAB",
                .build_code     = "AA",
                .flash_size_kb  = 128,
        },
        {
                .hwid           = 0x0027,
                .variant        = "QFAB",
                .build_code     = "AA",
                .flash_size_kb  = 128,
        },
        {
                .hwid           = 0x0027,
+               .part           = "51822",
                .variant        = "QFAB",
                .build_code     = "A0",
                .flash_size_kb  = 128,
        },
        {
                .hwid           = 0x0020,
                .variant        = "QFAB",
                .build_code     = "A0",
                .flash_size_kb  = 128,
        },
        {
                .hwid           = 0x0020,
+               .part           = "51822",
                .variant        = "CEAA",
                .build_code     = "BA",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x002F,
                .variant        = "CEAA",
                .build_code     = "BA",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x002F,
+               .part           = "51822",
                .variant        = "CEAA",
                .build_code     = "B0",
                .flash_size_kb  = 256,
                .variant        = "CEAA",
                .build_code     = "B0",
                .flash_size_kb  = 256,
@@ -173,54 +179,63 @@ static const struct nrf51_device_spec nrf51_known_devices_table[] = {
        /* nRF51822 Devices (IC rev 2). */
        {
                .hwid           = 0x002A,
        /* nRF51822 Devices (IC rev 2). */
        {
                .hwid           = 0x002A,
+               .part           = "51822",
                .variant        = "QFAA",
                .build_code     = "FA0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0044,
                .variant        = "QFAA",
                .build_code     = "FA0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0044,
+               .part           = "51822",
                .variant        = "QFAA",
                .build_code     = "GC0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x003C,
                .variant        = "QFAA",
                .build_code     = "GC0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x003C,
+               .part           = "51822",
                .variant        = "QFAA",
                .build_code     = "G0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0057,
                .variant        = "QFAA",
                .build_code     = "G0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0057,
+               .part           = "51822",
                .variant        = "QFAA",
                .build_code     = "G2",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0058,
                .variant        = "QFAA",
                .build_code     = "G2",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0058,
+               .part           = "51822",
                .variant        = "QFAA",
                .build_code     = "G3",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x004C,
                .variant        = "QFAA",
                .build_code     = "G3",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x004C,
+               .part           = "51822",
                .variant        = "QFAB",
                .build_code     = "B0",
                .flash_size_kb  = 128,
        },
        {
                .hwid           = 0x0040,
                .variant        = "QFAB",
                .build_code     = "B0",
                .flash_size_kb  = 128,
        },
        {
                .hwid           = 0x0040,
+               .part           = "51822",
                .variant        = "CEAA",
                .build_code     = "CA0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0047,
                .variant        = "CEAA",
                .build_code     = "CA0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0047,
+               .part           = "51822",
                .variant        = "CEAA",
                .build_code     = "DA0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x004D,
                .variant        = "CEAA",
                .build_code     = "DA0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x004D,
+               .part           = "51822",
                .variant        = "CEAA",
                .build_code     = "D00",
                .flash_size_kb  = 256,
                .variant        = "CEAA",
                .build_code     = "D00",
                .flash_size_kb  = 256,
@@ -229,42 +244,49 @@ static const struct nrf51_device_spec nrf51_known_devices_table[] = {
        /* nRF51822 Devices (IC rev 3). */
        {
                .hwid           = 0x0072,
        /* nRF51822 Devices (IC rev 3). */
        {
                .hwid           = 0x0072,
+               .part           = "51822",
                .variant        = "QFAA",
                .build_code     = "H0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x007B,
                .variant        = "QFAA",
                .build_code     = "H0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x007B,
+               .part           = "51822",
                .variant        = "QFAB",
                .build_code     = "C0",
                .flash_size_kb  = 128,
        },
        {
                .hwid           = 0x0083,
                .variant        = "QFAB",
                .build_code     = "C0",
                .flash_size_kb  = 128,
        },
        {
                .hwid           = 0x0083,
+               .part           = "51822",
                .variant        = "QFAC",
                .build_code     = "A0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0084,
                .variant        = "QFAC",
                .build_code     = "A0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0084,
+               .part           = "51822",
                .variant        = "QFAC",
                .build_code     = "A1",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x007D,
                .variant        = "QFAC",
                .build_code     = "A1",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x007D,
+               .part           = "51822",
                .variant        = "CDAB",
                .build_code     = "A0",
                .flash_size_kb  = 128,
        },
        {
                .hwid           = 0x0079,
                .variant        = "CDAB",
                .build_code     = "A0",
                .flash_size_kb  = 128,
        },
        {
                .hwid           = 0x0079,
+               .part           = "51822",
                .variant        = "CEAA",
                .build_code     = "E0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0087,
                .variant        = "CEAA",
                .build_code     = "E0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0087,
+               .part           = "51822",
                .variant        = "CFAC",
                .build_code     = "A0",
                .flash_size_kb  = 256,
                .variant        = "CFAC",
                .build_code     = "A0",
                .flash_size_kb  = 256,
@@ -273,18 +295,21 @@ static const struct nrf51_device_spec nrf51_known_devices_table[] = {
        /* nRF51422 Devices (IC rev 1). */
        {
                .hwid           = 0x001E,
        /* nRF51422 Devices (IC rev 1). */
        {
                .hwid           = 0x001E,
+               .part           = "51422",
                .variant        = "QFAA",
                .build_code     = "CA",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0024,
                .variant        = "QFAA",
                .build_code     = "CA",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0024,
+               .part           = "51422",
                .variant        = "QFAA",
                .build_code     = "C0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0031,
                .variant        = "QFAA",
                .build_code     = "C0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0031,
+               .part           = "51422",
                .variant        = "CEAA",
                .build_code     = "A0A",
                .flash_size_kb  = 256,
                .variant        = "CEAA",
                .build_code     = "A0A",
                .flash_size_kb  = 256,
@@ -293,24 +318,28 @@ static const struct nrf51_device_spec nrf51_known_devices_table[] = {
        /* nRF51422 Devices (IC rev 2). */
        {
                .hwid           = 0x002D,
        /* nRF51422 Devices (IC rev 2). */
        {
                .hwid           = 0x002D,
+               .part           = "51422",
                .variant        = "QFAA",
                .build_code     = "DAA",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x002E,
                .variant        = "QFAA",
                .build_code     = "DAA",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x002E,
+               .part           = "51422",
                .variant        = "QFAA",
                .build_code     = "E0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0061,
                .variant        = "QFAA",
                .build_code     = "E0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0061,
+               .part           = "51422",
                .variant        = "QFAB",
                .build_code     = "A00",
                .flash_size_kb  = 128,
        },
        {
                .hwid           = 0x0050,
                .variant        = "QFAB",
                .build_code     = "A00",
                .flash_size_kb  = 128,
        },
        {
                .hwid           = 0x0050,
+               .part           = "51422",
                .variant        = "CEAA",
                .build_code     = "B0",
                .flash_size_kb  = 256,
                .variant        = "CEAA",
                .build_code     = "B0",
                .flash_size_kb  = 256,
@@ -319,42 +348,49 @@ static const struct nrf51_device_spec nrf51_known_devices_table[] = {
        /* nRF51422 Devices (IC rev 3). */
        {
                .hwid           = 0x0073,
        /* nRF51422 Devices (IC rev 3). */
        {
                .hwid           = 0x0073,
+               .part           = "51422",
                .variant        = "QFAA",
                .build_code     = "F0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x007C,
                .variant        = "QFAA",
                .build_code     = "F0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x007C,
+               .part           = "51422",
                .variant        = "QFAB",
                .build_code     = "B0",
                .flash_size_kb  = 128,
        },
        {
                .hwid           = 0x0085,
                .variant        = "QFAB",
                .build_code     = "B0",
                .flash_size_kb  = 128,
        },
        {
                .hwid           = 0x0085,
+               .part           = "51422",
                .variant        = "QFAC",
                .build_code     = "A0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0086,
                .variant        = "QFAC",
                .build_code     = "A0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0086,
+               .part           = "51422",
                .variant        = "QFAC",
                .build_code     = "A1",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x007E,
                .variant        = "QFAC",
                .build_code     = "A1",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x007E,
+               .part           = "51422",
                .variant        = "CDAB",
                .build_code     = "A0",
                .flash_size_kb  = 128,
        },
        {
                .hwid           = 0x007A,
                .variant        = "CDAB",
                .build_code     = "A0",
                .flash_size_kb  = 128,
        },
        {
                .hwid           = 0x007A,
+               .part           = "51422",
                .variant        = "CEAA",
                .build_code     = "C0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0088,
                .variant        = "CEAA",
                .build_code     = "C0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0088,
+               .part           = "51422",
                .variant        = "CFAC",
                .build_code     = "A0",
                .flash_size_kb  = 256,
                .variant        = "CFAC",
                .build_code     = "A0",
                .flash_size_kb  = 256,
@@ -365,6 +401,7 @@ static const struct nrf51_device_spec nrf51_known_devices_table[] = {
           in the nRF51 Series Compatibility Matrix V1.0. */
        {
                .hwid           = 0x0071,
           in the nRF51 Series Compatibility Matrix V1.0. */
        {
                .hwid           = 0x0071,
+               .part           = "51822",
                .variant        = "QFAC",
                .build_code     = "AB",
                .flash_size_kb  = 256,
                .variant        = "QFAC",
                .build_code     = "AB",
                .flash_size_kb  = 256,
@@ -626,16 +663,18 @@ static int nrf51_probe(struct flash_bank *bank)
                         * bytes of the CONFIGID register */
 
        const struct nrf51_device_spec *spec = NULL;
                         * bytes of the CONFIGID register */
 
        const struct nrf51_device_spec *spec = NULL;
-       for (size_t i = 0; i < ARRAY_SIZE(nrf51_known_devices_table); i++)
+       for (size_t i = 0; i < ARRAY_SIZE(nrf51_known_devices_table); i++) {
                if (hwid == nrf51_known_devices_table[i].hwid) {
                        spec = &nrf51_known_devices_table[i];
                        break;
                }
                if (hwid == nrf51_known_devices_table[i].hwid) {
                        spec = &nrf51_known_devices_table[i];
                        break;
                }
+       }
 
        if (!chip->bank[0].probed && !chip->bank[1].probed) {
                if (spec)
 
        if (!chip->bank[0].probed && !chip->bank[1].probed) {
                if (spec)
-                       LOG_INFO("nRF51822-%s(build code: %s) %ukB Flash",
-                                spec->variant, spec->build_code, spec->flash_size_kb);
+                       LOG_INFO("nRF%s-%s(build code: %s) %ukB Flash",
+                                spec->part, spec->variant, spec->build_code,
+                                spec->flash_size_kb);
                else
                        LOG_WARNING("Unknown device (HWID 0x%08" PRIx32 ")", hwid);
        }
                else
                        LOG_WARNING("Unknown device (HWID 0x%08" PRIx32 ")", hwid);
        }
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)