diff options
| author | Tomas Vanek <vanekt@fbl.cz> | 2020-04-13 20:19:41 +0200 |
|---|---|---|
| committer | Tomas Vanek <vanekt@fbl.cz> | 2020-10-28 10:51:57 +0000 |
| commit | c1f4d9e6e8f9cdab122db36299e039a73151ffe4 (patch) | |
| tree | 445d8d670ef2ea1c3d73f669c79d2b3442055152 /src/flash | |
| parent | a5bf98f846eba410cdfc678b5b223052a68439c1 (diff) | |
| download | riscv-openocd-c1f4d9e6e8f9cdab122db36299e039a73151ffe4.zip riscv-openocd-c1f4d9e6e8f9cdab122db36299e039a73151ffe4.tar.gz riscv-openocd-c1f4d9e6e8f9cdab122db36299e039a73151ffe4.tar.bz2 | |
flash/nor/nrf5: unify size of HWID
HWID is a part of 32 bit CONFIGID register. hwid member of struct nrf5_info
was typed uint32_t to enable direct CONFIGID read and masked afterwards.
Change to uint16_t to unify with hwid in struct nrf5_device_spec
and RM description.
Change-Id: Ib720d3ce23c301aee41d074ea78a6f00a23aed68
Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-on: http://openocd.zylin.com/5589
Tested-by: jenkins
Diffstat (limited to 'src/flash')
| -rw-r--r-- | src/flash/nor/nrf5.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/flash/nor/nrf5.c b/src/flash/nor/nrf5.c index 02c1448..1784bcd 100644 --- a/src/flash/nor/nrf5.c +++ b/src/flash/nor/nrf5.c @@ -158,7 +158,7 @@ struct nrf5_info { bool ficr_info_valid; struct nrf52_ficr_info ficr_info; const struct nrf5_device_spec *spec; - uint32_t hwid; + uint16_t hwid; enum nrf5_features features; unsigned int flash_size_kb; unsigned int ram_size_kb; @@ -648,7 +648,7 @@ static int nrf5_info(struct flash_bank *bank, char *buf, int buf_size) variant, &variant[2]); } else { - res = snprintf(buf, buf_size, "nRF51xxx (HWID 0x%08" PRIx32 ")", + res = snprintf(buf, buf_size, "nRF51xxx (HWID 0x%04" PRIx16 ")", chip->hwid); } if (res <= 0) @@ -765,14 +765,15 @@ static int nrf5_probe(struct flash_bank *bank) struct nrf5_info *chip = nbank->chip; struct target *target = chip->target; - res = target_read_u32(target, NRF5_FICR_CONFIGID, &chip->hwid); + uint32_t configid; + res = target_read_u32(target, NRF5_FICR_CONFIGID, &configid); if (res != ERROR_OK) { LOG_ERROR("Couldn't read CONFIGID register"); return res; } - chip->hwid &= 0xFFFF; /* HWID is stored in the lower two - * bytes of the CONFIGID register */ + /* HWID is stored in the lower two bytes of the CONFIGID register */ + chip->hwid = configid & 0xFFFF; /* guess a nRF51 series if the device has no FICR INFO and we don't know HWID */ chip->features = NRF5_FEATURE_SERIES_51; |