interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

flash/stm32l4x: add support of STM32WB1x 

STM32WB1x devices has a single flash bank up to 320 KB (page 2KB)

note: STM32WB5x/WB3x are single banks as well but do have 4KB as page size.
note: remove the assert that checks if max_mages is power of two, because
      STM32WB1x flash size is not a power of 2

Change-Id: Ib514cf989ecb819d25d1c4a65d641d0a1a3d9f18
Signed-off-by: Tarek BOCHKATI <tarek.bouchkati@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/6129
Tested-by: jenkins
Reviewed-by: Oleksij Rempel <linux@rempel-privat.de>
This commit is contained in:
Tarek BOCHKATI 2021-03-26 15:07:41 +01:00 committed by Oleksij Rempel
parent af3575b931
commit 4f371e8eed
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/flash/nor/stm32l4x.c
View File

@ -64,16 +64,21 @@
* - for STM32L4P5/Q5x * - for STM32L4P5/Q5x
* In 1M FLASH devices bit 22 (DBANK) controls Dual Bank mode. * In 1M FLASH devices bit 22 (DBANK) controls Dual Bank mode.
* In 512K FLASH devices bit 21 (DB512K) controls Dual Bank mode. * In 512K FLASH devices bit 21 (DB512K) controls Dual Bank mode.
*
*/ */
/* STM32WBxxx series for reference. /* STM32WBxxx series for reference.
* *
* RM0434 (STM32WB55) * RM0434 (STM32WB55/WB35x)
* http://www.st.com/resource/en/reference_manual/dm00318631.pdf * http://www.st.com/resource/en/reference_manual/dm00318631.pdf
* *
* RM0471 (STM32WB50) * RM0471 (STM32WB50/WB30x)
* http://www.st.com/resource/en/reference_manual/dm00622834.pdf * http://www.st.com/resource/en/reference_manual/dm00622834.pdf
*
* RM0473 (STM32WB15x)
* http://www.st.com/resource/en/reference_manual/dm00649196.pdf
*
* RM0478 (STM32WB10x)
* http://www.st.com/resource/en/reference_manual/dm00689203.pdf
*/ */
/* STM32WLxxx series for reference. /* STM32WLxxx series for reference.
@ -335,6 +340,10 @@ static const struct stm32l4_rev stm32_482_revs[] = {
{ 0x1000, "A" }, { 0x1001, "Z" }, { 0x1003, "Y" }, { 0x2000, "B" }, { 0x1000, "A" }, { 0x1001, "Z" }, { 0x1003, "Y" }, { 0x2000, "B" },
}; };
static const struct stm32l4_rev stm32_494_revs[] = {
{ 0x1000, "A" }, { 0x2000, "B" },
};
static const struct stm32l4_rev stm32_495_revs[] = { static const struct stm32l4_rev stm32_495_revs[] = {
{ 0x2001, "2.1" }, { 0x2001, "2.1" },
}; };
@ -540,6 +549,18 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
.otp_base = 0x0BFA0000, .otp_base = 0x0BFA0000,
.otp_size = 512, .otp_size = 512,
}, },
{
.id = 0x494,
.revs = stm32_494_revs,
.num_revs = ARRAY_SIZE(stm32_494_revs),
.device_str = "STM32WB1x",
.max_flash_size_kb = 320,
.flags = F_NONE,
.flash_regs_base = 0x58004000,
.fsize_addr = 0x1FFF75E0,
.otp_base = 0x1FFF7000,
.otp_size = 1024,
},
{ {
.id = 0x495, .id = 0x495,
.revs = stm32_495_revs, .revs = stm32_495_revs,
@ -1832,6 +1853,7 @@ static int stm32l4_probe(struct flash_bank *bank)
case 0x466: /* STM32G03/G04xx */ case 0x466: /* STM32G03/G04xx */
case 0x468: /* STM32G43/G44xx */ case 0x468: /* STM32G43/G44xx */
case 0x479: /* STM32G49/G4Axx */ case 0x479: /* STM32G49/G4Axx */
case 0x494: /* STM32WB1x */
/* single bank flash */ /* single bank flash */
page_size_kb = 2; page_size_kb = 2;
num_pages = flash_size_kb / page_size_kb; num_pages = flash_size_kb / page_size_kb;
@ -1960,10 +1982,8 @@ static int stm32l4_probe(struct flash_bank *bank)
/* use *max_flash_size* instead of actual size as the trimmed versions /* use *max_flash_size* instead of actual size as the trimmed versions
* certainly use the same number of bits * certainly use the same number of bits
* max_flash_size is always power of two, so max_pages too
*/ */
uint32_t max_pages = stm32l4_info->part_info->max_flash_size_kb / page_size_kb; uint32_t max_pages = stm32l4_info->part_info->max_flash_size_kb / page_size_kb;
assert(IS_PWR_OF_2(max_pages));
/* in dual bank mode number of pages is doubled, but extra bit is bank selection */ /* in dual bank mode number of pages is doubled, but extra bit is bank selection */
stm32l4_info->wrpxxr_mask = ((max_pages >> (stm32l4_info->dual_bank_mode ? 1 : 0)) - 1); stm32l4_info->wrpxxr_mask = ((max_pages >> (stm32l4_info->dual_bank_mode ? 1 : 0)) - 1);