Skip to content

Suggested changes to stm32g0 #631

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

Merged
merged 3 commits into from
Nov 20, 2025
Merged

Suggested changes to stm32g0 #631

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1721aed
Suggested changes to stm32g0
gojimmypi Nov 6, 2025
759214c
Merge branch 'master' of https://github.com/wolfSSL/wolfBoot into pr-…
gojimmypi Nov 19, 2025
bd6d0aa
Remove duplicate FLASH_CR_PNB_nn
gojimmypi Nov 19, 2025
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
19 changes: 17 additions & 2 deletions hal/stm32g0.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@
#define FLASH_PAGE_SIZE (0x800) /* 2KB */

/* Register values */
#define FLASH_SR_CFGBSY (1 << 18) /* RM0444 - 3.7.4 - FLASH_SR */
#define FLASH_SR_BSY2 (1 << 17) /* RM0444 - 3.7.4 - FLASH_SR */
#define FLASH_SR_BSY1 (1 << 16) /* RM0444 - 3.7.4 - FLASH_SR */
#define FLASH_SR_SIZERR (1 << 6) /* RM0444 - 3.7.4 - FLASH_SR */
#define FLASH_SR_PGAERR (1 << 5) /* RM0444 - 3.7.4 - FLASH_SR */
Expand All @@ -90,6 +92,10 @@
#define FLASH_CR_PNB_SHIFT 3 /* RM0444 - 3.7.5 - FLASH_CR - PNB bits 9:3 */
#define FLASH_CR_PNB_MASK 0x7f /* RM0444 - 3.7.5 - FLASH_CR - PNB bits 9:3 - 7 bits */

#define FLASH_CR_BKER (1 << 13)
#define FLASH_CR_BKER_BITMASK 0x2000
#define BANK_SIZE (0x40000)

#define FLASH_SECR_SEC_SIZE_POS (0U)
#define FLASH_SECR_SEC_SIZE_MASK (0xFF)

Expand Down Expand Up @@ -128,7 +134,7 @@ int RAMFUNCTION hal_flash_write(uint32_t address, const uint8_t *data, int len)
if ((len - i > 3) && ((((address + i) & 0x07) == 0) &&
((((uint32_t)data) + i) & 0x07) == 0)) {
src = (uint32_t *)data;
dst = (uint32_t *)(address + FLASHMEM_ADDRESS_SPACE);
dst = (uint32_t *)address;
flash_wait_complete();
dst[i >> 2] = src[i >> 2];
dst[(i >> 2) + 1] = src[(i >> 2) + 1];
Expand Down Expand Up @@ -184,10 +190,19 @@ int RAMFUNCTION hal_flash_erase(uint32_t address, int len)
uint32_t p;
if (len == 0)
return -1;
address -= FLASHMEM_ADDRESS_SPACE;
end_address = address + len - 1;
for (p = address; p < end_address; p += FLASH_PAGE_SIZE) {
while (FLASH_SR & (FLASH_SR_BSY1 | FLASH_SR_BSY2));
flash_clear_errors();
while (FLASH_SR & FLASH_SR_CFGBSY);
uint32_t page_number = (p >> 11) & FLASH_CR_PNB_MASK;
uint32_t reg = FLASH_CR & (~(FLASH_CR_PNB_MASK << FLASH_CR_PNB_SHIFT));
FLASH_CR = reg | ((p >> 11) << FLASH_CR_PNB_SHIFT) | FLASH_CR_PER;
reg &= ~(FLASH_CR_BKER_BITMASK);
if (p >= BANK_SIZE) {
reg |= FLASH_CR_BKER;
}
FLASH_CR = reg | (page_number << FLASH_CR_PNB_SHIFT) | FLASH_CR_PER;
DMB();
FLASH_CR |= FLASH_CR_STRT;
flash_wait_complete();
Expand Down