STM32G4: dual bank FLASH detection

jeromecoutant · jeromecoutant · commit 61d00d858f8e · 2021-01-13T16:45:03.000+01:00
diff --git a/targets/TARGET_STM/TARGET_STM32G4/flash_api.c b/targets/TARGET_STM/TARGET_STM32G4/flash_api.c
@@ -48,7 +48,7 @@ static uint32_t GetPage(uint32_t Addr)
 static uint32_t GetBank(uint32_t Addr)
 {
     uint32_t bank = 0;
-#if defined(SYSCFG_MEMRMP_FB_MODE) && defined(FLASH_OPTR_DBANK)
+#if defined (FLASH_OPTR_DBANK)
     if (READ_BIT(SYSCFG->MEMRMP, SYSCFG_MEMRMP_FB_MODE) == 0) {
         /* No Bank swap */
         if (Addr < (FLASH_BASE + FLASH_BANK_SIZE)) {
@@ -106,7 +106,6 @@ int32_t flash_erase_sector(flash_t *obj, uint32_t address)
     int32_t status = 0;
 
     if ((address >= (FLASH_BASE + FLASH_SIZE)) || (address < FLASH_BASE)) {
-
         return -1;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ static uint32_t GetPage(uint32_t Addr)`
`48`	`48`	`static uint32_t GetBank(uint32_t Addr)`
`49`	`49`	`{`
`50`	`50`	`uint32_t bank = 0;`
`51`		`-#if defined(SYSCFG_MEMRMP_FB_MODE) && defined(FLASH_OPTR_DBANK)`
	`51`	`+#if defined (FLASH_OPTR_DBANK)`
`52`	`52`	`if (READ_BIT(SYSCFG->MEMRMP, SYSCFG_MEMRMP_FB_MODE) == 0) {`
`53`	`53`	`/* No Bank swap */`
`54`	`54`	`if (Addr < (FLASH_BASE + FLASH_BANK_SIZE)) {`
`@@ -106,7 +106,6 @@ int32_t flash_erase_sector(flash_t *obj, uint32_t address)`
`106`	`106`	`int32_t status = 0;`
`107`	`107`
`108`	`108`	`if ((address >= (FLASH_BASE + FLASH_SIZE)) \|\| (address < FLASH_BASE)) {`
`109`		`-`
`110`	`109`	`return -1;`
`111`	`110`	`}`
`112`	`111`