RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

cpu/stm32/flashpage: adapt to non dual-core stm32wl

Browse Source
This commit is contained in:
Francisco Molina 2021-07-21 11:27:00 +02:00
parent 8a8e023d04
commit c62f6e0590
No known key found for this signature in database
GPG Key ID: 3E94EAC3DBDEEDA8
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cpu/stm32/Makefile.include
View File

@ -13,13 +13,20 @@ ROM_LEN_K := $(shell echo $(ROM_LEN) | sed 's/K//')
RAM_LEN_K := $(shell echo $(RAM_LEN) | sed 's/K//')
ifneq (,$(filter w%,$(CPU_FAM)))
# adjust RAM_LEN and ROM_LEN according to CPU2 RAM_LEN and ROM_LEN
CPU2_RAM_LEN_K := $(shell echo $(CPU2_RAM_LEN) | sed 's/K//')
RAM_LEN := $(shell echo $$(( ($(RAM_LEN_K) - $(CPU2_RAM_LEN_K) ) * $(KB) )))
CPU2_ROM_LEN_K := $(shell echo $(CPU2_ROM_LEN) | sed 's/K//')
FLASHSIZE := $(shell echo $$(( ($(ROM_LEN_K) - $(CPU2_ROM_LEN_K) )* $(KB) )) )
ROM_LEN := $(shell echo $$(( ($(ROM_LEN_K) - $(CPU2_ROM_LEN_K) ) ))K)
ifneq (,$(CPU2_RAM_LEN))
# adjust RAM_LEN and ROM_LEN according to CPU2 RAM_LEN and ROM_LEN
CPU2_RAM_LEN_K := $(shell echo $(CPU2_RAM_LEN) | sed 's/K//')
RAM_LEN := $(shell echo $$(( ($(RAM_LEN_K) - $(CPU2_RAM_LEN_K) ) * $(KB) )))
else
RAM_LEN := $(shell echo $$(( $(RAM_LEN_K) * $(KB) )) )
endif
ifneq (,$(CPU2_ROM_LEN))
CPU2_ROM_LEN_K := $(shell echo $(CPU2_ROM_LEN) | sed 's/K//')
FLASHSIZE := $(shell echo $$(( ($(ROM_LEN_K) - $(CPU2_ROM_LEN_K) )* $(KB) )) )
ROM_LEN := $(shell echo $$(( ($(ROM_LEN_K) - $(CPU2_ROM_LEN_K) ) ))K)
else
FLASHSIZE := $(shell echo $$(( $(ROM_LEN_K) * $(KB) )) )
endif
else
FLASHSIZE := $(shell echo $$(( $(ROM_LEN_K) * $(KB) )) )
RAM_LEN := $(shell echo $$(( $(RAM_LEN_K) * $(KB) )) )

3
cpu/stm32/periph/flashpage.c
View File

@ -190,7 +190,8 @@ void flashpage_erase(unsigned page)
assert(page < (int)FLASHPAGE_NUMOF);
/* ensure there is no attempt to write to CPU2 protected area */
#if defined(CPU_FAM_STM32WB) || defined(CPU_FAM_STM32WL)
#if defined(CPU_FAM_STM32WB) || (defined(CPU_FAM_STM32WL) && \
!defined(CPU_LINE_STM32WLE5xx))
assert(page < (int)(FLASH->SFR & FLASH_SFR_SFSA));
#endif

6
drivers/periph_common/flashpage.c
View File

@ -33,7 +33,8 @@ void flashpage_read(unsigned page, void *data)
{
assert(page < FLASHPAGE_NUMOF);
#if defined(CPU_FAM_STM32WB) || defined(CPU_FAM_STM32WL)
#if defined(CPU_FAM_STM32WB) || (defined(CPU_FAM_STM32WL) && \
!defined(CPU_LINE_STM32WLE5xx))
assert(page < (FLASH->SFR & FLASH_SFR_SFSA));
#endif
@ -44,7 +45,8 @@ int flashpage_verify(unsigned page, const void *data)
{
assert(page < (int)FLASHPAGE_NUMOF);
#if defined(CPU_FAM_STM32WB) || defined(CPU_FAM_STM32WL)
#if defined(CPU_FAM_STM32WB) || (defined(CPU_FAM_STM32WL) && \
!defined(CPU_LINE_STM32WLE5xx))
assert(page < (int)(FLASH->SFR & FLASH_SFR_SFSA));
#endif