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

nRF54L15: Add initial TF-M support #1571

Merged
merged 5 commits into from
Mar 22, 2024
Merged

Conversation

Vge0rge
Copy link
Contributor

@Vge0rge Vge0rge commented Mar 8, 2024

No description provided.

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Mar 11, 2024

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@Vge0rge Vge0rge changed the title Not for review yet - just for CI nRF54L15: Add initial TF-M support Mar 15, 2024
@Vge0rge Vge0rge marked this pull request as ready for review March 15, 2024 21:01
@Vge0rge Vge0rge requested a review from jciupis as a code owner March 15, 2024 21:01
@Vge0rge Vge0rge force-pushed the nrf54l_initial_tfm branch from 8b776d6 to 0057071 Compare March 15, 2024 21:04
@SebastianBoe
Copy link
Contributor

if we use a fixup for the noup it will be easier to identify that it should be squashed later.

See

https://nordicsemi.atlassian.net/wiki/spaces/NCS/pages/108201225/Pull+Requests

for how to format the commit message of the fixup.

Copy link
Contributor

@mswarowsky mswarowsky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@Vge0rge Vge0rge force-pushed the nrf54l_initial_tfm branch 5 times, most recently from a6558aa to 2b25897 Compare March 20, 2024 22:14
Vge0rge and others added 5 commits March 22, 2024 10:30
The option SOC_NRF54L_GLITCHDET_WORKAROUND is not
needed anymore becuase the glitch detector is already
disabled in the Nordic MDK in the hal_nordic repo.

File path in hal_nordic:
nrfx/mdk/system_nrf54l.c

Signed-off-by: Georgios Vasilakis <[email protected]>
(cherry picked from commit 0bc547ea3bb3f2d254c0ecb0e06583f04be71366)
The soc_secure_* function are used by the non-secure application
to access hardware resources which are mapped as secure.
Using these functions for hardware resources mapped as non-secure
is missleading.

We have some soc_secure_* functions which read FICR values.
In nRF91 and nRF53 platforms this made sense since FICR
has hardware fixed mapping as secure.
For nRF54 though the FICR has hardware fixed mapping as non-secure.

This change refactors the soc_secure.h to exclude the functions
which read FICR values from being included when FICR is mapped as
non-secure.

Also updates the hwinfo and ieee802154 drivers to adjust to this change.

Upstream PR: zephyrproject-rtos/zephyr#69968

Signed-off-by: Georgios Vasilakis <[email protected]>
Add SOC_NRF54LX_DISABLE_FICR_TRIMCNF and
SOC_NRF54LX_SKIP_GLITCHDETECTOR_DISABLE config options.

Signed-off-by: Magdalena Pastula <[email protected]>
(cherry picked from commit b0b4bc0)
Add support for propagating SOC_NRF54LX_DISABLE_FICR_TRIMCNF and
SOC_NRF54LX_SKIP_GLITCHDETECTOR_DISABLE values to nrfx.

Signed-off-by: Magdalena Pastula <[email protected]>
(cherry picked from commit 92f1b3f)
fixup! [nrf noup] modules: mbedtls: add PSA configurations

PSA_HAS_KEY_AGREEMENT needs to be selected if at least
one of the two key agreement algorithms ECDH/FFDH is enabled.

Ref: NCSDK-26277

Signed-off-by: Georgios Vasilakis <[email protected]>
@Vge0rge Vge0rge force-pushed the nrf54l_initial_tfm branch from 2b25897 to b763682 Compare March 22, 2024 09:30
@rlubos rlubos merged commit 05ff843 into nrfconnect:main Mar 22, 2024
12 checks passed
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.

7 participants