andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix EFL L4+ and G0 dual bank checking wrong register 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@13093 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
cinsights 2019-10-07 12:02:58 +00:00
parent b6ad15437b
commit 07cd318987
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
os/hal/ports/STM32/STM32G0xx/hal_efl_lld.c
View File

@ -143,7 +143,7 @@ static inline size_t stm32_flash_get_size(void) {
static inline bool stm32_flash_dual_bank(EFlashDriver *eflp) { static inline bool stm32_flash_dual_bank(EFlashDriver *eflp) {
#if STM32_FLASH_NUMBER_OF_BANKS > 1 #if STM32_FLASH_NUMBER_OF_BANKS > 1
return ((eflp->flash->SR & (FLASH_OPTR_DBANK | FLASH_OPTR_DB1M)) != 0U); #error "Device settings incorrectly configured - single bank mode only supported"
#endif #endif
(void)eflp; (void)eflp;
return false; return false;
@ -588,7 +588,8 @@ flash_error_t efl_lld_verify_erase(void *instance, flash_sector_t sector) {
devp->state = FLASH_READ; devp->state = FLASH_READ;
/* Scanning the sector space.*/ /* Scanning the sector space.*/
for (i = 0U; i < bank->sectors_size / sizeof(uint32_t); i++) { uint32_t sector_size = flashGetSectorSize(getBaseFlash(devp), sector);
for (i = 0U; i < sector_size / sizeof(uint32_t); i++) {
if (*address != 0xFFFFFFFFU) { if (*address != 0xFFFFFFFFU) {
err = FLASH_ERROR_VERIFY; err = FLASH_ERROR_VERIFY;
break; break;

7
os/hal/ports/STM32/STM32L4xx+/hal_efl_lld.c
View File

@ -167,7 +167,7 @@ static inline size_t stm32_flash_get_size(void) {
static inline bool stm32_flash_dual_bank(EFlashDriver *eflp) { static inline bool stm32_flash_dual_bank(EFlashDriver *eflp) {
#if STM32_FLASH_NUMBER_OF_BANKS > 1 #if STM32_FLASH_NUMBER_OF_BANKS > 1
return ((eflp->flash->SR & (FLASH_OPTR_DBANK | FLASH_OPTR_DB1M)) != 0U); return ((eflp->flash->OPTR & (FLASH_OPTR_DBANK | FLASH_OPTR_DB1M)) != 0U);
#endif #endif
return false; return false;
} }
@ -603,7 +603,7 @@ flash_error_t efl_lld_verify_erase(void *instance, flash_sector_t sector) {
return FLASH_BUSY_ERASING; return FLASH_BUSY_ERASING;
} }
/* Address of the sector in the selected bank.*/ /* Address of the sector in the bank.*/
address = (uint32_t *)(bank->address + address = (uint32_t *)(bank->address +
flashGetSectorOffset(getBaseFlash(devp), sector)); flashGetSectorOffset(getBaseFlash(devp), sector));
@ -611,7 +611,8 @@ flash_error_t efl_lld_verify_erase(void *instance, flash_sector_t sector) {
devp->state = FLASH_READ; devp->state = FLASH_READ;
/* Scanning the sector space.*/ /* Scanning the sector space.*/
for (i = 0U; i < bank->sectors_size / sizeof(uint32_t); i++) { uint32_t sector_size = flashGetSectorSize(getBaseFlash(devp), sector);
for (i = 0U; i < sector_size / sizeof(uint32_t); i++) {
if (*address != 0xFFFFFFFFU) { if (*address != 0xFFFFFFFFU) {
err = FLASH_ERROR_VERIFY; err = FLASH_ERROR_VERIFY;
break; break;