Skip to content

Conversation

@joerchan
Copy link
Contributor

Add option to enable the SFN model when building TF-M.
The SFN model will eventually replace the Library model.

Change the default model to be IPC, which follows the default
configuration of TF-M.

Allow building for nRF non-secure and TF-M enabled without having the
platform partition enabled.

theotherjimmy
theotherjimmy previously approved these changes Sep 23, 2022
Copy link
Member

@microbuilder microbuilder left a comment

Choose a reason for hiding this comment

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

Tiny nit, sorry, but requesting changes since CI failing anyway.

Comment on lines 317 to 318
Copy link
Member

Choose a reason for hiding this comment

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

Super nit, but since there is a CI failure we may as well fix this at the same time as any update:

Suggested change
The SFN model support the SFN Partition model, and the isolation
levels 1.
The SFN model supports the SFN Partition model, and isolation
level 1.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Spelling is Kconfig help text is not nit ;)

@microbuilder
Copy link
Member

@theotherjimmy Do you have any bandwidth to have a look at that failure on the lpc55s69, since you have some experience with that part, and I'm not sure @joerchan has one available?

@joerchan
Copy link
Contributor Author

@microbuilder @theotherjimmy I suspect the lpc55 issue is related to TFM_IPC being default now, and this has an issue for the board. Maybe we could check if this is an issue on the main branch as well.

We could put this board as default Library model for the time and open an issue to resolve it later.

@joerchan
Copy link
Contributor Author

@theotherjimmy It is a kconfig / cmake issue, so you don't have too look into this problem. I can fix this myself.

@joerchan
Copy link
Contributor Author

CI Issue resolved. Conditional prompt on a choice symbol meant that none of the options was selected, which is not a valid.

microbuilder
microbuilder previously approved these changes Sep 27, 2022
Copy link
Contributor

@SebastianBoe SebastianBoe left a comment

Choose a reason for hiding this comment

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

changes requested

SebastianBoe
SebastianBoe previously approved these changes Sep 29, 2022
Copy link
Contributor

@SebastianBoe SebastianBoe left a comment

Choose a reason for hiding this comment

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

Very nicely configured.

Copy link
Member

Choose a reason for hiding this comment

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

The BOARD_NRF_GPIO_FORWARDER_FOR_NRF5340 option is defined as available only for nrf5340dk_nrf5340_cpuapp* targets, but also others, like thingy53_nrf5340_cpuapp* and bl5340_dvk_cpuapp*, need to use the code wrapped in this #if.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks. I moved the Kconfig to SOC common, since it affects nrf53/soc.c, and then all boards need to select it on their BOARD_ENABLE_CPUNET.

Make Kconfig produce an error when GPIOs cannot be forwarded in the
current configuration instead of silently excluding the forwarding.

Signed-off-by: Joakim Andersson <[email protected]>
Allow building for nRF non-secure and TF-M enabled without having the
platform partition enabled.
In this configuration the soc_secure functions have no valid
implementation, leave it as a compilation error if the application
includes the functions.

Add missing dependency on soc_secure functions being available for
SOC_HFXO_CAP_INTERNAL configuration.

Signed-off-by: Joakim Andersson <[email protected]>
Add option to enable the SFN model when building TF-M.
The SFN model will eventually replace the Library model.

Change the default model to be IPC, which follows the default
configuration of TF-M.

Signed-off-by: Joakim Andersson <[email protected]>
@fabiobaltieri fabiobaltieri added this to the v3.3.0 milestone Sep 30, 2022
@carlescufi carlescufi merged commit 3abcc19 into zephyrproject-rtos:main Oct 3, 2022
@joerchan joerchan deleted the tfm-sfn-upstream branch October 4, 2022 07:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area: TF-M ARM Trusted Firmware-M (TF-M) manifest-trusted-firmware-m platform: Laird Connectivity Laird Connectivity platform: nRF Nordic nRFx

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants