Skip to content

Commit 7e26a71

Browse files
titouanckartben
authored andcommitted
drivers: flash: stm32: fix FLASH_ constants renamed in hal_stm32
In hal_stm32 commit "update stm32h7rs to cube version V1.2.0" zephyrproject-rtos/hal_stm32@e5eba65 the constants FLASH_OPTKEY1/2 for the STM32H7RS have been renamed to FLASH_OPT_KEY1/2. For backward compatibility, 2 defines have been added to Legacy/stm32_hal_legacy.h, so that FLASH_OPTKEYx is an alias for FLASH_OPT_KEYx. However, in Zephyr's STM32 flash driver, the alias is defined the other way around since 5dc5373, which leads to Twister build failures, for example https://github.com/zephyrproject-rtos/zephyr/actions/runs/14927867714/job/41936931524#step:12:1335 To fix the build issue, we can simply remove that alias in Zephyr, since it is no longer needed. Signed-off-by: Titouan Christophe <[email protected]>
1 parent f411f48 commit 7e26a71

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

drivers/flash/flash_stm32.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ struct flash_stm32_priv {
5555
#define FLASH_CR_SNB FLASH_CR_SSN
5656
#define FLASH_CR_SNB_Pos FLASH_CR_SSN_Pos
5757
#define KEYR1 KEYR
58-
#define FLASH_OPT_KEY1 FLASH_OPTKEY1
59-
#define FLASH_OPT_KEY2 FLASH_OPTKEY2
6058
#endif /* CONFIG_SOC_SERIES_STM32H7RSX */
6159

6260
/* Differentiate between arm trust-zone non-secure/secure, and others. */

0 commit comments

Comments
 (0)