Skip to content

Commit 173cc1f

Browse files
author
Tauno Magnusson
committed
Cleaning out workaround patches for G431KB now that Flash Bank Switching has been fixed on G4xxx level (ARMmbed/mbed-os patch #14149)
1 parent e4fb740 commit 173cc1f

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

targets/TARGET_STM/TARGET_STM32G4/STM32Cube_FW/CMSIS/stm32g431xx.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9604,10 +9604,9 @@ typedef struct
96049604
#define SYSCFG_MEMRMP_MEM_MODE_1 (0x2UL << SYSCFG_MEMRMP_MEM_MODE_Pos) /*!< 0x00000002 */
96059605
#define SYSCFG_MEMRMP_MEM_MODE_2 (0x4UL << SYSCFG_MEMRMP_MEM_MODE_Pos) /*!< 0x00000004 */
96069606

9607-
// Commented out because G431KB only has one Flash Bank
9608-
// #define SYSCFG_MEMRMP_FB_MODE_Pos (8U)
9609-
// #define SYSCFG_MEMRMP_FB_MODE_Msk (0x1UL << SYSCFG_MEMRMP_FB_MODE_Pos) /*!< 0x00000100 */
9610-
// #define SYSCFG_MEMRMP_FB_MODE SYSCFG_MEMRMP_FB_MODE_Msk /*!< User Flash Bank mode selection */
9607+
#define SYSCFG_MEMRMP_FB_MODE_Pos (8U)
9608+
#define SYSCFG_MEMRMP_FB_MODE_Msk (0x1UL << SYSCFG_MEMRMP_FB_MODE_Pos) /*!< 0x00000100 */
9609+
#define SYSCFG_MEMRMP_FB_MODE SYSCFG_MEMRMP_FB_MODE_Msk /*!< User Flash Bank mode selection */
96119610

96129611
/****************** Bit definition for SYSCFG_CFGR1 register ******************/
96139612
#define SYSCFG_CFGR1_BOOSTEN_Pos (8U)

targets/TARGET_STM/TARGET_STM32G4/STM32Cube_FW/STM32G4xx_HAL_Driver/stm32g4xx_hal.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -595,9 +595,7 @@ void HAL_SYSCFG_CCMSRAMErase(void)
595595
*/
596596
void HAL_SYSCFG_EnableMemorySwappingBank(void)
597597
{
598-
#if defined(SYSCFG_MEMRMP_FB_MODE)
599598
SET_BIT(SYSCFG->MEMRMP, SYSCFG_MEMRMP_FB_MODE);
600-
#endif
601599
}
602600

603601
/**
@@ -612,9 +610,7 @@ void HAL_SYSCFG_EnableMemorySwappingBank(void)
612610
*/
613611
void HAL_SYSCFG_DisableMemorySwappingBank(void)
614612
{
615-
#if defined(SYSCFG_MEMRMP_FB_MODE)
616613
CLEAR_BIT(SYSCFG->MEMRMP, SYSCFG_MEMRMP_FB_MODE);
617-
#endif
618614
}
619615

620616
#if defined(VREFBUF)

0 commit comments

Comments
 (0)