sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch: stm32h7: Add support for dual bank flash

Browse Source 
memory

Signed-off-by: Andrés Sánchez Pascual <tito97_sp@hotmail.com>
This commit is contained in:
Andrés Sánchez Pascual 2022-10-08 17:19:28 +02:00 committed by Xiang Xiao
parent 70053700b8
commit c28b05efd3
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
arch/arm/src/stm32h7/stm32_flash.c
View File

@ -137,6 +137,7 @@
# define STM32_FLASH_NBLOCKS 16 # define STM32_FLASH_NBLOCKS 16
# define STM32_FLASH_SIZE _K(16 * 128) # define STM32_FLASH_SIZE _K(16 * 128)
# define STM32_DUAL_BANK 1
#endif #endif
@ -182,7 +183,7 @@ static struct stm32h7_flash_priv_s stm32h7_flash_bank1_priv =
.stblock = 0, .stblock = 0,
.stpage = 0, .stpage = 0,
}; };
#if STM32_FLASH_NBLOCKS > 1 #if STM32_DUAL_BANK
static struct stm32h7_flash_priv_s stm32h7_flash_bank2_priv = static struct stm32h7_flash_priv_s stm32h7_flash_bank2_priv =
{ {
.sem = SEM_INITIALIZER(1), .sem = SEM_INITIALIZER(1),
@ -330,15 +331,24 @@ static inline uint32_t stm32h7_flash_size(
static inline static inline
struct stm32h7_flash_priv_s * stm32h7_flash_bank(size_t address) struct stm32h7_flash_priv_s * stm32h7_flash_bank(size_t address)
{ {
struct stm32h7_flash_priv_s *priv = &stm32h7_flash_bank1_priv; struct stm32h7_flash_priv_s *priv = NULL;
if (address < priv->base || address >=
priv->base + stm32h7_flash_size(priv)) uint32_t bank_size;
#ifdef STM32_DUAL_BANK
bank_size = stm32h7_flash_size(priv) / 2;
#else
bank_size = stm32h7_flash_size(priv);
#endif
if (address >= stm32h7_flash_bank1_priv.base &&
address < stm32h7_flash_bank1_priv.base + bank_size)
{ {
return NULL; priv = &stm32h7_flash_bank1_priv;
} }
#if STM32_FLASH_NBLOCKS > 1 #ifdef STM32_DUAL_BANK
if (address >= stm32h7_flash_bank2_priv.base) else if (address >= stm32h7_flash_bank2_priv.base &&
address < stm32h7_flash_bank2_priv.base + bank_size)
{ {
priv = &stm32h7_flash_bank2_priv; priv = &stm32h7_flash_bank2_priv;
} }
@ -363,7 +373,7 @@ static int stm32h7_israngeerased(size_t startaddress, size_t size)
size_t bwritten = 0; size_t bwritten = 0;
if (!stm32h7_flash_bank(startaddress) || if (!stm32h7_flash_bank(startaddress) ||
!stm32h7_flash_bank(startaddress + size)) !stm32h7_flash_bank(startaddress + size - 1))
{ {
return -EIO; return -EIO;
} }
@ -380,7 +390,7 @@ static int stm32h7_israngeerased(size_t startaddress, size_t size)
count += 4; count += 4;
} }
baddr = (uint8_t *)addr; baddr = (uint8_t *)startaddress;
while (count < size) while (count < size)
{ {
if (getreg8(baddr) != FLASH_ERASEDVALUE) if (getreg8(baddr) != FLASH_ERASEDVALUE)
@ -388,6 +398,7 @@ static int stm32h7_israngeerased(size_t startaddress, size_t size)
bwritten++; bwritten++;
} }
baddr++;
count++; count++;
} }