WolfSSL
/
wolfBoot
mirror of https://github.com/wolfSSL/wolfBoot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Reverted hal_flash_ functions moved to static

pull/449/head
Daniele Lacamera 2024-05-14 18:41:20 +02:00
parent 02bfe8a6a1
commit 34652ffebf
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hal/stm32h5.c
View File

@ -37,7 +37,7 @@ static void RAMFUNCTION flash_set_waitstates(unsigned int waitstates)
while ((FLASH_ACR & FLASH_ACR_LATENCY_MASK) != waitstates); while ((FLASH_ACR & FLASH_ACR_LATENCY_MASK) != waitstates);
} }
static void RAMFUNCTION hal_flash_wait_complete(void) void RAMFUNCTION hal_flash_wait_complete(uint8_t bank)
{ {
while ((FLASH_SR & FLASH_SR_BSY) == FLASH_SR_BSY) while ((FLASH_SR & FLASH_SR_BSY) == FLASH_SR_BSY)
; ;
@ -48,7 +48,7 @@ static void RAMFUNCTION hal_flash_wait_complete(void)
} }
static void RAMFUNCTION hal_flash_wait_buffer_empty(void) static void RAMFUNCTION hal_flash_wait_buffer_empty(uint8_t bank)
{ {
while ((FLASH_SR & FLASH_SR_DBNE) == FLASH_SR_DBNE) while ((FLASH_SR & FLASH_SR_DBNE) == FLASH_SR_DBNE)
; ;
@ -96,7 +96,7 @@ int RAMFUNCTION hal_flash_write(uint32_t address, const uint8_t *data, int len)
dst[i >> 2] = dword[0]; dst[i >> 2] = dword[0];
ISB(); ISB();
dst[(i >> 2) + 1] = dword[1]; dst[(i >> 2) + 1] = dword[1];
hal_flash_wait_complete(); hal_flash_wait_complete(0);
if ((*sr & FLASH_SR_EOP) != 0) if ((*sr & FLASH_SR_EOP) != 0)
*sr |= FLASH_SR_EOP; *sr |= FLASH_SR_EOP;
*cr &= ~FLASH_CR_PG; *cr &= ~FLASH_CR_PG;
@ -110,7 +110,7 @@ int RAMFUNCTION hal_flash_write(uint32_t address, const uint8_t *data, int len)
void RAMFUNCTION hal_flash_unlock(void) void RAMFUNCTION hal_flash_unlock(void)
{ {
hal_flash_wait_complete(); hal_flash_wait_complete(0);
if ((FLASH_CR & FLASH_CR_LOCK) != 0) { if ((FLASH_CR & FLASH_CR_LOCK) != 0) {
FLASH_KEYR = FLASH_KEY1; FLASH_KEYR = FLASH_KEY1;
DMB(); DMB();
@ -123,14 +123,14 @@ void RAMFUNCTION hal_flash_unlock(void)
void RAMFUNCTION hal_flash_lock(void) void RAMFUNCTION hal_flash_lock(void)
{ {
hal_flash_wait_complete(); hal_flash_wait_complete(0);
if ((FLASH_CR & FLASH_CR_LOCK) == 0) if ((FLASH_CR & FLASH_CR_LOCK) == 0)
FLASH_CR |= FLASH_CR_LOCK; FLASH_CR |= FLASH_CR_LOCK;
} }
void RAMFUNCTION hal_flash_opt_unlock(void) void RAMFUNCTION hal_flash_opt_unlock(void)
{ {
hal_flash_wait_complete(); hal_flash_wait_complete(0);
if ((FLASH_OPTCR & FLASH_OPTCR_OPTLOCK) != 0) { if ((FLASH_OPTCR & FLASH_OPTCR_OPTLOCK) != 0) {
FLASH_OPTKEYR = FLASH_OPTKEY1; FLASH_OPTKEYR = FLASH_OPTKEY1;
DMB(); DMB();
@ -145,7 +145,7 @@ void RAMFUNCTION hal_flash_opt_unlock(void)
void RAMFUNCTION hal_flash_opt_lock(void) void RAMFUNCTION hal_flash_opt_lock(void)
{ {
FLASH_OPTCR |= FLASH_OPTCR_OPTSTRT; FLASH_OPTCR |= FLASH_OPTCR_OPTSTRT;
hal_flash_wait_complete(); hal_flash_wait_complete(0);
if ((FLASH_OPTCR & FLASH_OPTCR_OPTLOCK) == 0) if ((FLASH_OPTCR & FLASH_OPTCR_OPTLOCK) == 0)
FLASH_OPTCR |= FLASH_OPTCR_OPTLOCK; FLASH_OPTCR |= FLASH_OPTCR_OPTLOCK;
} }
@ -187,7 +187,7 @@ int RAMFUNCTION hal_flash_erase(uint32_t address, int len)
FLASH_CR = reg; FLASH_CR = reg;
DMB(); DMB();
FLASH_CR |= FLASH_CR_STRT; FLASH_CR |= FLASH_CR_STRT;
hal_flash_wait_complete(); hal_flash_wait_complete(0);
} }
/* If the erase operation is completed, disable the associated bits */ /* If the erase operation is completed, disable the associated bits */
FLASH_CR &= ~FLASH_CR_SER ; FLASH_CR &= ~FLASH_CR_SER ;
@ -446,8 +446,8 @@ int hal_flash_otp_write(uint32_t flashAddress, const void* data, uint16_t length
return -1; return -1;
} }
hal_flash_wait_complete(); hal_flash_wait_complete(0);
hal_flash_wait_buffer_empty(); hal_flash_wait_buffer_empty(0);
hal_flash_unlock(); hal_flash_unlock();
hal_flash_clear_errors(0); hal_flash_clear_errors(0);
@ -456,7 +456,7 @@ int hal_flash_otp_write(uint32_t flashAddress, const void* data, uint16_t length
length = (length / 2 * 2); length = (length / 2 * 2);
while (idx < length && flashAddress <= FLASH_OTP_END-1) { while (idx < length && flashAddress <= FLASH_OTP_END-1) {
hal_flash_wait_complete(); hal_flash_wait_complete(0);
/* Set PG bit */ /* Set PG bit */
FLASH_CR |= FLASH_CR_PG; FLASH_CR |= FLASH_CR_PG;
/* Program an OTP word (32 bits) */ /* Program an OTP word (32 bits) */