tf-m: Fix tf-m-test build issues #68619
Merged
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
TF-M 2.0.0 doesn't use the TFM_TEST_REPO_PATH anymore so removing it. Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
QCBOR is only needed by the TF-M tests, as they are not build separately due to the TF-M split build. If we still set it there is a CMake build warning. Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
The TF-M crypto modules got renames from CRYPTO_XXX_MODULE_DISABLED to CRYPTO_XXX_MODULE_ENABLED Therefore also re naming it in zephyr build integration. Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
mswarowsky
force-pushed
the
fix_tfm_tests
branch
from
75c0285 to
3196c10
Compare
Vge0rge
approved these changes
Feb 6, 2024
vlilleboe
approved these changes
Feb 7, 2024
SebastianBoe
approved these changes
Feb 8, 2024
Vge0rge
pushed a commit
to Vge0rge/sdk-zephyr
that referenced
this pull request
Feb 12, 2024
TF-M 2.0.0 doesn't use the TFM_TEST_REPO_PATH anymore so removing it. Upstream PR:zephyrproject-rtos/zephyr#68619 Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
Vge0rge
pushed a commit
to Vge0rge/sdk-zephyr
that referenced
this pull request
Feb 12, 2024
QCBOR is only needed by the TF-M tests, as they are not build separately due to the TF-M split build By still setting it we get a CMake build warning Upstream PR: zephyrproject-rtos/zephyr#68619 Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
Vge0rge
pushed a commit
to Vge0rge/sdk-zephyr
that referenced
this pull request
Feb 12, 2024
The TF-M crypto modules got renames from CRYPTO_XXX_MODULE_DISABLED to CRYPTO_XXX_MODULE_ENABLED Therefore also re naming it in zephyr build integration. Upstream PR: zephyrproject-rtos/zephyr#68619 Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
Contributor
|
@d3zd3z : Hi David, can we get this merged? |
d3zd3z
approved these changes
Feb 13, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 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.
Remove unneeded things in the tf-m CMakeLists.txt and renaming things