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] soc: nordic: nrf54l: remove redundant ELV code #2345

Merged
merged 9 commits into from
Dec 16, 2024

Conversation

mstasiaknordic
Copy link
Contributor

Removed dead ELV code from nRF54L soc.

Upstream PR #: 82546

@mstasiaknordic
Copy link
Contributor Author

mstasiaknordic commented Dec 6, 2024

@nordicjm commit tags fail because of conflict with code from [noup] commits. Is reverting and unreverting noups the only way to pass?

@mstasiaknordic mstasiaknordic force-pushed the elv_dead_code branch 3 times, most recently from e255e4d to 935c6ae Compare December 11, 2024 10:47
mstasiaknordic and others added 9 commits December 13, 2024 09:25
…cted time"

This reverts commit 382877e.

Signed-off-by: Michał Stasiak <[email protected]>
…ith TFM"

This reverts commit ee23470.

Signed-off-by: Michał Stasiak <[email protected]>
This reverts commit 4279ea3.

Signed-off-by: Michał Stasiak <[email protected]>
Removed dead ELV code from nRF54L soc.

Signed-off-by: Michał Stasiak <[email protected]>
(cherry picked from commit 4c96cbb)
Add a custom section in the linker which should always
be placed in the top of RAM. This will be used by the
KMU to push keys into it. Since when you provision a key
into the KMU you need to set specific a memory location
for the PUSH operation we need to keep this memory location
static across images/dfus.

This is a noup since the KMU is not supported upstream.

Ref: NCSDK-25121

Signed-off-by: Georgios Vasilakis <[email protected]>
(cherry picked from commit 9ce3906)
(cherry picked from commit 95d3bde)
In this patch we do several things to be able to configure power and
clocks when NRF_OSCILLATORS and NRF_REGULATORS is secure.

We port soc.c to TF-M so that the TF-M image can do the same
configuration that would normally be done by the Zephyr image.

This is done by explicitly including autoconf.h for instance.

We also ifdef-out the configuration when nordicsemi_nrf54l_init is
invoked from a non-secure image, because the peripherals are secure.

Signed-off-by: Sebastian Bøe <[email protected]>
(cherry picked from commit 962fa00)
(cherry picked from commit 028f0c4)
Noup as it patches code that does not exist in zephyr
arch_busy_wait and k_busy_wait waited half the expected time
due to SystemCoreClock being set back to the default value when ns
builds. Changed to rely on device tree as to avoid
hardcoded clock frequencies

Signed-off-by: Dag Erik Gjørvad <[email protected]>
Update path for autoconf.h which is now in zephyr/autoconf.h

Signed-off-by: Frank Audun Kvamtrø <[email protected]>
(cherry picked from commit b22c113)
(cherry picked from commit 02f8b45)
@jukkar jukkar merged commit 923f090 into nrfconnect:main Dec 16, 2024
15 checks passed
@mstasiaknordic mstasiaknordic deleted the elv_dead_code branch January 2, 2025 07:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants