Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[nrf fromlist] Fix tests and samples for TF-M with partition-manager #1415

Merged

Conversation

joerchan
Copy link
Contributor

@joerchan joerchan commented Dec 6, 2023

Make sure that the flash partition is valid.
With TF-M enabled the storage_partition can be used as memory that is
known to be configured as non-secure flash region.
The slot1_ns_partition partition is only define when TF-M is built with bootloader.

@joerchan joerchan force-pushed the tfm-fix-samples-and-test-slot1-partition branch from 81a4443 to 1332ba1 Compare December 6, 2023 12:31
@de-nordic de-nordic requested a review from nordicjm December 6, 2023 12:33
@joerchan joerchan added the DNM label Dec 7, 2023
@joerchan
Copy link
Contributor Author

joerchan commented Dec 7, 2023

DNM: Can maybe replace this with the changes from: zephyrproject-rtos/zephyr#66279

Instead of enabling a bootloader for the slot1_ns_partition to be valid, we can enable settings for the storage_partition to be valid.

@joerchan joerchan force-pushed the tfm-fix-samples-and-test-slot1-partition branch from 1332ba1 to 34a0d19 Compare December 8, 2023 15:23
@joerchan joerchan requested a review from anangl as a code owner December 8, 2023 15:23
@joerchan joerchan changed the title [nrf noup] tfm: Make slot1_ns_partition a valid partition [nrf fromlist] Fix tests and samples for TF-M with partition-manager Dec 8, 2023
@joerchan joerchan removed the DNM label Dec 8, 2023
@joerchan joerchan force-pushed the tfm-fix-samples-and-test-slot1-partition branch from 34a0d19 to bb74fa7 Compare December 9, 2023 14:18
…for nordic boards

Enable the TF-M NS storage partition for nordic boards.
This partition is otherwise not used, and configured as secure.

Fixes: #59376

Upstream PR: zephyrproject-rtos/zephyr#66279

Signed-off-by: Joakim Andersson <[email protected]>
…artition

Stop erasing outside of the test partition.
We shouldn't really on this being accesible memory.
This region may be consider as secure when application is non-secure.

Upstream PR: zephyrproject-rtos/zephyr#66279

Signed-off-by: Joakim Andersson <[email protected]>
Print a finished message, so that it is clear that this in the end
of the sample. This makes it certain that we didn't crash without
output on the last test.

Upstream PR: zephyrproject-rtos/zephyr#66279

Signed-off-by: Joakim Andersson <[email protected]>
…tion is valid

Make sure that the flash partition is valid.
With TF-M enabled the storage_partition can be used as memory that is
known to be configured as non-secure flash region.
The slot1_ns_partition partition is only correct when TF-M is built
with BL2 enabled.

Upstream PR: zephyrproject-rtos/zephyr#66279

Signed-off-by: Joakim Andersson <[email protected]>
…e nonsecure

With TF-M enabled the storage_partition can be used as memory that is
known to be configured as non-secure flash region.
The slot1_ns_partition partition is only correct when TF-M is built
with BL2 enabled.

Upstream PR: zephyrproject-rtos/zephyr#66279

Signed-off-by: Joakim Andersson <[email protected]>
@joerchan joerchan force-pushed the tfm-fix-samples-and-test-slot1-partition branch from bb74fa7 to 67f1d60 Compare December 12, 2023 13:29
@rlubos rlubos merged commit 1c92e08 into nrfconnect:main Dec 13, 2023
10 checks passed
@joerchan joerchan deleted the tfm-fix-samples-and-test-slot1-partition branch December 13, 2023 15:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants