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 fromtree] soc: arm: Remove CPU_HAS_NRF_IDAU's dependencies #1409

Merged
merged 3 commits into from
Dec 13, 2023

Conversation

mswarowsky
Copy link
Contributor

CPU_HAS_NRF_IDAU is depending on SOC_SERIES_NRF91X and SOC_NRF5340_CPUAPP.

This makes it more difficult to have an out-of-tree nrf SOC.

It is also an unnecessary dependency. There is no prompt for CPU_HAS_NRF_IDAU, so it will not show up in menuconfig and it won't be possible to enable it from a users Kconfig fragment.

The only way to enable it is to select it, and those that select this option can themselves make sure that they only do so when appropriate.

Also, move NRF_SPU options out to SOC Kconfig files to also make out-of-tree SoCs possible. With the added benefit of not polluting the common soc/arm/Kconfig.

(cherry picked from commit 6348a97)

@mswarowsky
Copy link
Contributor Author

  1. I added two more commits, there re-request review from @anangl

Copy link
Contributor

@anangl anangl left a comment

Choose a reason for hiding this comment

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

Please use for these two new commits titles that differ at least a bit from each other (for example, add "for nRF53" and "for nRF91", respectively). In the current form, it is confusing.

@mswarowsky
Copy link
Contributor Author

Please use for these two new commits titles that differ at least a bit from each other (for example, add "for nRF53" and "for nRF91", respectively). In the current form, it is confusing.

Oh yeah, added nRF 53 and 91 in the commit message

soc/arm/nordic_nrf/nrf53/Kconfig.soc Outdated Show resolved Hide resolved
SebastianBoe and others added 3 commits December 12, 2023 13:36
CPU_HAS_NRF_IDAU is depending on SOC_SERIES_NRF91X and
SOC_NRF5340_CPUAPP.

This makes it more difficult to have an out-of-tree nrf SOC.

It is also an unnecessary dependency. There is no prompt for
CPU_HAS_NRF_IDAU, so it will not show up in menuconfig and it won't be
possible to enable it from a users Kconfig fragment.

The only way to enable it is to select it, and those that select this
option can themselves make sure that they only do so when appropriate.

Also, move NRF_SPU options out to SOC Kconfig files to also make
out-of-tree SoCs possible. With the added benefit of not polluting the
common soc/arm/Kconfig.

Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
(cherry picked from commit 6348a97)
Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
TF-M will uses SPU alignment during build time to make sure all
partitions can be locked down with the SPU.

So adding them for nRF53

Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
TF-M will uses SPU alignment during build time to make sure all
partitions can be locked down with the SPU.

So adding them for nRF91

Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
@rlubos rlubos merged commit 89be433 into nrfconnect:main Dec 13, 2023
10 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.

6 participants