secure_storage: fix Kconfig dependencies #86181
Merged
+41
−9
Conversation
This file contains 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
JordanYates
changed the title
JordanYates
force-pushed
the
250222_secure_storage_deps
branch
from
5efcce9 to
89cace2
Compare
|
Removed additional |
tomi-font
requested changes
Feb 24, 2025
There was a problem hiding this comment.
Thanks for the fixes.
You will need to adjust the configurations under samples/psa/ and tests/subsys/secure_storage/ to enable those Kconfig options where needed.
Because now with your PR all the tests get skipped because of the filters as some conditions are missing:
zephyr$ twister -p native_sim -T ./samples/psa
[...]
INFO - 1/6 native_sim/native samples/psa/its/sample.psa.its.secure_storage.entropy_driver FILTERED (runtime filter)
INFO - 2/6 native_sim/native samples/psa/persistent_key/sample.psa.persistent_key.secure_storage.entropy_not_secure FILTERED (runtime filter)
INFO - 3/6 native_sim/native samples/psa/persistent_key/sample.psa.persistent_key.secure_storage.entropy_driver FILTERED (runtime filter)
INFO - 4/6 native_sim/native samples/psa/its/sample.psa.its.tfm FILTERED (runtime filter)
INFO - 5/6 native_sim/native samples/psa/persistent_key/sample.psa.persistent_key.tfm FILTERED (runtime filter)
INFO - 6/6 native_sim/native samples/psa/its/sample.psa.its.secure_storage.entropy_not_secure FILTERED (runtime filter)
717aa45 to
fc39f58
Compare
tomi-font
reviewed
Feb 24, 2025
`FLASH_PAGE_LAYOUT` has a hardware dependency on `FLASH_HAS_PAGE_LAYOUT` which is not present for all boards. Forcing this symbol to `y` when the hardware doesn't support it results in build errors at the Kconfig stage. `FLASH_PAGE_LAYOUT` is enabled by default when `FLASH_HAS_PAGE_LAYOUT` is true, so this change will not require any user changes. Signed-off-by: Jordan Yates <[email protected]>
`SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS` does not use either the `FLASH_MAP` or `NVS` APIs, only `SETTINGS`. Similarly, `SECURE_STORAGE_ITS_STORE_MODULE` does not consist of any code itself and therefore should not select or imply any options. Signed-off-by: Jordan Yates <[email protected]>
JordanYates
force-pushed
the
250222_secure_storage_deps
branch
from
fc39f58 to
967818f
Compare
JordanYates
force-pushed
the
250222_secure_storage_deps
branch
from
967818f to
0979108
Compare
|
The FLASH commit is required for CI to work, and is a dedicated PR in #86327 |
tomi-font
requested changes
Feb 26, 2025
JordanYates
force-pushed
the
250222_secure_storage_deps
branch
from
0979108 to
9fb07c5
Compare
tomi-font
reviewed
Feb 26, 2025
Mixing `select` and `depends on` is a common source of Kconfig dependency loops and should be avoided. Both `ZMS` and `SETTINGS` are more commonly used with `depends on` rather than `select`. The usage here also contradicts the Zephyr best practices guide for `select`: * Avoid selecting symbols with prompts or dependencies. Prefer depends on. Signed-off-by: Jordan Yates <[email protected]>
Now that `SECURE_STORAGE` does not `select` dependencies, they need to be enabled explicitly by the tests. Signed-off-by: Jordan Yates <[email protected]>
JordanYates
force-pushed
the
250222_secure_storage_deps
branch
from
9fb07c5 to
863e191
Compare
tomi-font
approved these changes
Feb 27, 2025
de-nordic
approved these changes
Feb 27, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGSdoes not use either theFLASH_MAPorNVSAPIs, onlySETTINGS. Similarly,SECURE_STORAGE_ITS_STORE_MODULEdoes not consist of any code itself and therefore should not select or imply any options.Mixing
selectanddepends onis a common source of Kconfig dependency loops and should be avoided. BothZMSandSETTINGSare more commonly used withdepends onrather thanselect.The usage here also contradicts the Zephyr best practices guide for
select:Fixes #86328