drivers: flash: stm32: fix FLASH_ constants renamed in hal_stm32 #89740
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 <titouan.christophe@mind.be>
github-actions
bot
requested review from
FRASTM,
GeorgeCGV,
de-nordic,
djiatsaf-st,
erwango,
gautierg-st,
marwaiehm-st,
mathieuchopstm and
rghaddab
|
de-nordic
approved these changes
May 9, 2025
kartben
added
the
Hotfix
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 titouan.christophe@mind.be