Skip to content

fix: internal flash bank usage for wba #793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Cássio Romanin de Lazaro (cassio-lazaro) wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: internal flash bank usage for wba #793

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef2f65e
Fix internal flash bank usage for wba
cassio-lazaro Apr 24, 2026
a64ca08
fix build for target STM32H5
cassio-lazaro May 11, 2026
586a8b0
fix for STM32F family
cassio-lazaro May 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions hal_st/stm32fxxx/FlashInternalStm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,17 @@

namespace
{
#if defined(STM32H5)
#if defined(FLASH_DBANK_SUPPORT) || defined(FLASH_BANK_SIZE)
uint32_t GetBank(const uint8_t* memoryBegin)
{
auto address = reinterpret_cast<uint32_t>(memoryBegin);
if (READ_BIT(FLASH->OPTSR_CUR, FLASH_OPTSR_SWAP_BANK) == 0)
{
// No Bank swap
return (address < (FLASH_BASE + FLASH_BANK_SIZE)) ? FLASH_BANK_1 : FLASH_BANK_2;
}
else
{
// Bank swap
return (address < (FLASH_BASE + FLASH_BANK_SIZE)) ? FLASH_BANK_2 : FLASH_BANK_1;
}
#if defined(FLASH_OPTSR_SWAP_BANK)
// Bank swap
if (READ_BIT(FLASH->OPTSR_CUR, FLASH_OPTSR_SWAP_BANK))
return (address < (FLASH_BASE + FLASH_BANK_SIZE)) ? FLASH_BANK_2 : FLASH_BANK_1;
#endif

return (address < (FLASH_BASE + FLASH_BANK_SIZE)) ? FLASH_BANK_1 : FLASH_BANK_2;

Check failure on line 18 in hal_st/stm32fxxx/FlashInternalStm.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wb55) 

'FLASH_BANK_2' was not declared in this scope; did you mean 'FLASH_BASE'?

Check failure on line 18 in hal_st/stm32fxxx/FlashInternalStm.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wb55) 

'FLASH_BANK_1' was not declared in this scope; did you mean 'FLASH_BASE'?

Check failure on line 18 in hal_st/stm32fxxx/FlashInternalStm.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wba52) 

'FLASH_BANK_2' was not declared in this scope; did you mean 'FLASH_BANK_1'?

Check failure on line 18 in hal_st/stm32fxxx/FlashInternalStm.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32g071) 

'FLASH_BANK_2' was not declared in this scope; did you mean 'FLASH_BANK_1'?

Check failure on line 18 in hal_st/stm32fxxx/FlashInternalStm.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32g070) 

'FLASH_BANK_2' was not declared in this scope; did you mean 'FLASH_BANK_1'?
}
#endif

Expand Down Expand Up @@ -47,7 +44,7 @@

const auto flashBegin = reinterpret_cast<uint32_t>(flashMemory.begin());

#if defined(STM32WBA) || defined(STM32H5)
#if defined(FLASH_TYPEPROGRAM_QUADWORD)
detail::AlignedWriteBuffer<uint128_t, FLASH_TYPEPROGRAM_QUADWORD, true>(buffer, address, flashBegin);
#elif defined(STM32WB) || defined(STM32G4) || defined(STM32G0)
detail::AlignedWriteBuffer<uint64_t, FLASH_TYPEPROGRAM_DOUBLEWORD, false>(buffer, address, flashBegin);
Expand Down Expand Up @@ -96,6 +93,9 @@
eraseInitStruct.TypeErase = FLASH_TYPEERASE_PAGES;
eraseInitStruct.Page = beginIndex;
eraseInitStruct.NbPages = endIndex - beginIndex;
#if defined(FLASH_DBANK_SUPPORT) || defined(FLASH_BANK_BOTH)
eraseInitStruct.Banks = GetBank(flashMemory.begin());

Check failure on line 97 in hal_st/stm32fxxx/FlashInternalStm.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32wba52) 

'struct FLASH_EraseInitTypeDef' has no member named 'Banks'
#endif

auto result = HAL_FLASHEx_Erase(&eraseInitStruct, &pageError);
really_assert(result == HAL_OK);
Expand Down
Loading