nrf51: show proper part number

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>

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;
+       const char *part;
        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,
+               .part           = "51822",
                .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,
+               .part           = "51822",
                .variant        = "QFAB",
                .build_code     = "A0",
                .flash_size_kb  = 128,
        },
        {
                .hwid           = 0x0020,
+               .part           = "51822",
                .variant        = "CEAA",
                .build_code     = "BA",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x002F,
+               .part           = "51822",
                .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,
+               .part           = "51822",
                .variant        = "QFAA",
                .build_code     = "FA0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0044,
+               .part           = "51822",
                .variant        = "QFAA",
                .build_code     = "GC0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x003C,
+               .part           = "51822",
                .variant        = "QFAA",
                .build_code     = "G0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0057,
+               .part           = "51822",
                .variant        = "QFAA",
                .build_code     = "G2",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0058,
+               .part           = "51822",
                .variant        = "QFAA",
                .build_code     = "G3",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x004C,
+               .part           = "51822",
                .variant        = "QFAB",
                .build_code     = "B0",
                .flash_size_kb  = 128,
        },
        {
                .hwid           = 0x0040,
+               .part           = "51822",
                .variant        = "CEAA",
                .build_code     = "CA0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0047,
+               .part           = "51822",
                .variant        = "CEAA",
                .build_code     = "DA0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x004D,
+               .part           = "51822",
                .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,
+               .part           = "51822",
                .variant        = "QFAA",
                .build_code     = "H0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x007B,
+               .part           = "51822",
                .variant        = "QFAB",
                .build_code     = "C0",
                .flash_size_kb  = 128,
        },
        {
                .hwid           = 0x0083,
+               .part           = "51822",
                .variant        = "QFAC",
                .build_code     = "A0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0084,
+               .part           = "51822",
                .variant        = "QFAC",
                .build_code     = "A1",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x007D,
+               .part           = "51822",
                .variant        = "CDAB",
                .build_code     = "A0",
                .flash_size_kb  = 128,
        },
        {
                .hwid           = 0x0079,
+               .part           = "51822",
                .variant        = "CEAA",
                .build_code     = "E0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0087,
+               .part           = "51822",
                .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,
+               .part           = "51422",
                .variant        = "QFAA",
                .build_code     = "CA",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0024,
+               .part           = "51422",
                .variant        = "QFAA",
                .build_code     = "C0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0031,
+               .part           = "51422",
                .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,
+               .part           = "51422",
                .variant        = "QFAA",
                .build_code     = "DAA",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x002E,
+               .part           = "51422",
                .variant        = "QFAA",
                .build_code     = "E0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0061,
+               .part           = "51422",
                .variant        = "QFAB",
                .build_code     = "A00",
                .flash_size_kb  = 128,
        },
        {
                .hwid           = 0x0050,
+               .part           = "51422",
                .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,
+               .part           = "51422",
                .variant        = "QFAA",
                .build_code     = "F0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x007C,
+               .part           = "51422",
                .variant        = "QFAB",
                .build_code     = "B0",
                .flash_size_kb  = 128,
        },
        {
                .hwid           = 0x0085,
+               .part           = "51422",
                .variant        = "QFAC",
                .build_code     = "A0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0086,
+               .part           = "51422",
                .variant        = "QFAC",
                .build_code     = "A1",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x007E,
+               .part           = "51422",
                .variant        = "CDAB",
                .build_code     = "A0",
                .flash_size_kb  = 128,
        },
        {
                .hwid           = 0x007A,
+               .part           = "51422",
                .variant        = "CEAA",
                .build_code     = "C0",
                .flash_size_kb  = 256,
        },
        {
                .hwid           = 0x0088,
+               .part           = "51422",
                .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,
+               .part           = "51822",
                .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;
-       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 (!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);
        }