From a0dae1dda21fc22517dccce3834af03714dadba4 Mon Sep 17 00:00:00 2001 From: Damien George Date: Tue, 7 Jun 2022 15:06:12 +1000 Subject: [PATCH] stm32/flash: Remove FLASH_OPTR_DBANK condition in L4, H7 get_bank func. This was added by mistake in 8f68e26f79ee325669fb7dc7bbd092fccd5b038f when adding support for G4 MCUs, which does not using this get_bank() function. FLASH_OPTR_DBANK is only defined on G4 and L4 MCUs, so on H7 this FLASH_BANK_2 code was being wrongly excluded. Signed-off-by: Damien George --- ports/stm32/flash.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ports/stm32/flash.c b/ports/stm32/flash.c index 2644e0f58a..de537aba21 100644 --- a/ports/stm32/flash.c +++ b/ports/stm32/flash.c @@ -140,20 +140,12 @@ static uint32_t get_bank(uint32_t addr) { if (addr < (FLASH_BASE + FLASH_BANK_SIZE)) { return FLASH_BANK_1; } else { - #if defined(FLASH_OPTR_DBANK) return FLASH_BANK_2; - #else - return 0; - #endif } } else { // bank swap if (addr < (FLASH_BASE + FLASH_BANK_SIZE)) { - #if defined(FLASH_OPTR_DBANK) return FLASH_BANK_2; - #else - return 0; - #endif } else { return FLASH_BANK_1; }