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

Soc tfm #15492

Merged
merged 2 commits into from
Jul 16, 2024
Merged

Soc tfm #15492

merged 2 commits into from
Jul 16, 2024

Conversation

SebastianBoe
Copy link
Contributor

No description provided.

@github-actions github-actions bot added doc-required PR must not be merged without tech writer approval. manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels May 24, 2024
@NordicBuilder
Copy link
Contributor

NordicBuilder commented May 24, 2024

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

Name Old Revision New Revision Diff
trusted-firmware-m nrfconnect/sdk-trusted-firmware-m@v2.0.0-ncs2 nrfconnect/sdk-trusted-firmware-m@f334e66 (main) nrfconnect/sdk-trusted-firmware-m@v2.0.0-ncs2..f334e66e

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

@NordicBuilder
Copy link
Contributor

This pr introduces changes to requirements files.
The compiled requirements-fixed.txt has changed.
To automatically add the changed file to this pr react with the 👀 emote to this comment and re-run the check.
Check Run

requirements-fixed.txt diff
diff --git a/scripts/requirements-fixed.txt b/scripts/requirements-fixed.txt
index 16e9293..235d8cd 100644
--- a/scripts/requirements-fixed.txt
+++ b/scripts/requirements-fixed.txt
@@ -57,7 +57,6 @@ jsonschema-specifications==2023.7.1  # via jsonschema
junit2html==30.1.3        # via -r zephyr/scripts/requirements-extras.txt
junitparser==3.1.0        # via -r zephyr/scripts/requirements-compliance.txt
lark==1.1.7               # via pyocd
-lazy-object-proxy==1.9.0  # via astroid
libusb==1.0.27            # via -r nrf/scripts/requirements-extra.txt
libusb-package==1.0.26.2  # via pyocd
lpc-checksum==2.2.0       # via -r zephyr/scripts/requirements-extras.txt
@@ -132,7 +131,7 @@ urllib3==2.0.7            # via requests
wcwidth==0.2.6            # via prettytable
west==1.2.0               # via -r nrf/scripts/requirements-base.txt, -r zephyr/scripts/requirements-base.txt
wget==3.2                 # via -r nrf/scripts/requirements-ci.txt
-wrapt==1.15.0             # via astroid, deprecated, python-can
+wrapt==1.15.0             # via deprecated, python-can
yamllint==1.32.0          # via -r zephyr/scripts/requirements-compliance.txt
zcbor==0.8.1              # via -r nrf/scripts/requirements-build.txt, -r nrf/scripts/requirements-extra.txt, -r zephyr/scripts/requirements-extras.txt
zipp==3.17.0              # via importlib-metadata, importlib-resources

Note: This comment is automatically posted and updated by the Comment GitHub Action.

@NordicBuilder
Copy link
Contributor

NordicBuilder commented May 24, 2024

Test specification

CI/Jenkins/NRF

  • Integration Platforms

CI/Jenkins/integration

Test Module File based changes Manually selected West overwrite
test-fw-nrfconnect-nrf_crypto X
test-fw-nrfconnect-tfm X
test-sdk-find-my X

test-fw-nrfconnect-tfm: added because there was no .github/test-spec.yml in 'trusted-firmware-m'

Detailed information of selected test modules

Note: This message is automatically posted and updated by the CI

@github-actions github-actions bot removed the doc-required PR must not be merged without tech writer approval. label May 29, 2024
@SebastianBoe SebastianBoe marked this pull request as ready for review May 29, 2024 08:41
@NordicBuilder
Copy link
Contributor

You can find the documentation preview for this PR at this link. It will be updated about 10 minutes after the documentation build succeeds.

Note: This comment is automatically posted by the Documentation Publishing GitHub Action.

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

@SebastianBoe SebastianBoe force-pushed the soc_tfm branch 2 times, most recently from 6eaaaec to b6e246b Compare May 31, 2024 10:08
@vili-nordic vili-nordic force-pushed the soc_tfm branch 2 times, most recently from 77f8e80 to 8679b49 Compare July 10, 2024 11:20
@vili-nordic vili-nordic added the CI-Requested Approves single commit for CI tests on Internal HW label Jul 10, 2024
@github-actions github-actions bot removed the CI-Requested Approves single commit for CI tests on Internal HW label Jul 11, 2024
@vili-nordic vili-nordic added the CI-Requested Approves single commit for CI tests on Internal HW label Jul 11, 2024
@github-actions github-actions bot removed the CI-Requested Approves single commit for CI tests on Internal HW label Jul 11, 2024
@vili-nordic vili-nordic added the CI-Requested Approves single commit for CI tests on Internal HW label Jul 11, 2024
@github-actions github-actions bot removed the CI-Requested Approves single commit for CI tests on Internal HW label Jul 15, 2024
@vili-nordic vili-nordic added the CI-Requested Approves single commit for CI tests on Internal HW label Jul 15, 2024
@github-actions github-actions bot removed the CI-Requested Approves single commit for CI tests on Internal HW label Jul 15, 2024
@NordicBuilder NordicBuilder removed the DNM label Jul 15, 2024
@vili-nordic vili-nordic added the CI-Requested Approves single commit for CI tests on Internal HW label Jul 15, 2024
@github-actions github-actions bot removed the CI-Requested Approves single commit for CI tests on Internal HW label Jul 15, 2024
@vili-nordic vili-nordic added the CI-Requested Approves single commit for CI tests on Internal HW label Jul 15, 2024
@github-actions github-actions bot removed the CI-Requested Approves single commit for CI tests on Internal HW label Jul 16, 2024
@vili-nordic vili-nordic added the CI-Requested Approves single commit for CI tests on Internal HW label Jul 16, 2024
update

Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
Add Zephyr's soc.c to the TF-M build system and TF-M image.

Zephyr's soc.c will do misc. power and clock configuration based on
the Kconfig and DT of the non-secure image.

But the non-secure image does not have access to NRF_OSCILLATORS or
NRF_REGULATORS for security reasons.

To solve this we have ported soc.c to TF-M.

Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
@github-actions github-actions bot removed the CI-Requested Approves single commit for CI tests on Internal HW label Jul 16, 2024
@vili-nordic vili-nordic added the CI-Requested Approves single commit for CI tests on Internal HW label Jul 16, 2024
@rlubos rlubos merged commit 25ac756 into nrfconnect:main Jul 16, 2024
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. CI-Requested Approves single commit for CI tests on Internal HW manifest manifest-find-my manifest-matter manifest-mcuboot manifest-sidewalk manifest-trusted-firmware-m manifest-zephyr
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants