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

Rework of nrf54l/soc.c to get rid of noup commits #20478

Merged
merged 2 commits into from
Feb 25, 2025

Conversation

nordic-krch
Copy link
Contributor

Rework of zephyr nrf54l/soc.c file to get rid of TFM specific changes. Extended kernel.h used for TFM build to get rid of compilation errors.

@nordic-krch nordic-krch requested review from a team as code owners February 19, 2025 08:24
@github-actions github-actions bot added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Feb 19, 2025
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Feb 19, 2025

The following west manifest projects have changed revision in this Pull Request:

Name Old Revision New Revision Diff

All manifest checks OK

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

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Feb 19, 2025

CI Information

To view the history of this post, clich the 'edited' button above
Build number: 9

Inputs:

Sources:

sdk-nrf: PR head: 7976e640417190636b66d94f901461755d43911c

more details

sdk-nrf:

PR head: 7976e640417190636b66d94f901461755d43911c
merge base: 5d52344ad59b9d9885f878b81301306524262b64
target head (main): 42a30f729cbd3d1205fb62b9d8ee897b631e5d0d
Diff

Github labels

Enabled Name Description
ci-disabled Disable the ci execution
ci-all-test Run all of ci, no test spec filtering will be done
ci-force-downstream Force execution of downstream even if twister fails
ci-run-twister Force run twister
ci-run-zephyr-twister Force run zephyr twister
List of changed files detected by CI (2)
modules
│  ├── trusted-firmware-m
│  │  ├── Kconfig
│  │  ├── tfm_boards
│  │  │  ├── include
│  │  │  │  ├── zephyr
│  │  │  │  │  │ kernel.h

Outputs:

Toolchain

Version: aedb4c0245
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:aedb4c0245_bece0367df

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister
    • sdk-nrf test count: 664
  • ✅ Integration tests
    • ✅ test-fw-nrfconnect-boot
    • ✅ test-fw-nrfconnect-nrf_crypto
    • ✅ test-fw-nrfconnect-tfm
    • ✅ test-sdk-find-my
    • ✅ test-sdk-mcuboot
    • ⚠️ test-fw-nrfconnect-fw-update
Disabled integration tests
    • desktop52_verification
    • doc-internal
    • test_ble_nrf_config
    • test-fw-nrfconnect-apps
    • test-fw-nrfconnect-ble_mesh
    • test-fw-nrfconnect-ble_samples
    • test-fw-nrfconnect-chip
    • test-fw-nrfconnect-fem
    • test-fw-nrfconnect-nfc
    • test-fw-nrfconnect-nrf-iot_cloud
    • test-fw-nrfconnect-nrf-iot_libmodem-nrf
    • test-fw-nrfconnect-nrf-iot_lwm2m
    • test-fw-nrfconnect-nrf-iot_mosh
    • test-fw-nrfconnect-nrf-iot_positioning
    • test-fw-nrfconnect-nrf-iot_samples
    • test-fw-nrfconnect-nrf-iot_serial_lte_modem
    • test-fw-nrfconnect-nrf-iot_thingy91
    • test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
    • test-fw-nrfconnect-proprietary_esb
    • test-fw-nrfconnect-ps
    • test-fw-nrfconnect-rpc
    • test-fw-nrfconnect-rs
    • test-fw-nrfconnect-thread
    • test-fw-nrfconnect-zigbee
    • test-low-level
    • test-sdk-audio
    • test-sdk-dfu
    • test-sdk-pmic-samples
    • test-sdk-sidewalk
    • test-sdk-wifi
    • test-secdom-samples-public

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

@NordicBuilder
Copy link
Contributor

You can find the documentation preview for this PR at this link.

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

@Vge0rge
Copy link
Contributor

Vge0rge commented Feb 20, 2025

Since you changed how the frequency is set for 54l15 do you mind to update this:

default $(div, $(dt_node_int_prop_int,/cpus/cpu@0,clock-frequency), 1000000) \

to get the current values in this PR as well?

Copy link
Contributor

@tomi-font tomi-font left a comment

Choose a reason for hiding this comment

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

s/TFM/TF-M/

@nordic-krch nordic-krch requested a review from a team as a code owner February 21, 2025 07:04
Copy link

github-actions bot commented Feb 21, 2025

After documentation is built, you will find the preview for this PR here.

@nordic-krch
Copy link
Contributor Author

@Vge0rge done. Can you take a look? @tomi-font commit message updated.

Copy link
Contributor

@tomi-font tomi-font left a comment

Choose a reason for hiding this comment

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

Message of commit manifest: Update zephyr with changes in nrf54l soc.c still has one TFM. (I'll let Georgios ack on behalf of Aegir anyway.)

@nordic-krch
Copy link
Contributor Author

ah, the manifest commit. Forgot about that one. Fixed.

CPU in nRF54L Series does not specifiy clock-frequency in the cpu
node. Cpu node indicated which clock source is used and frequency
of that clock determines CPU frequency. Use hfpll frequency to
get CPU frequency for nRF54L Series.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
Add errno.h to the kernel.h used for TF-M builds.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
@tomi-font tomi-font requested a review from Vge0rge February 25, 2025 09:09
Copy link
Contributor

@frkv frkv left a comment

Choose a reason for hiding this comment

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

LGTM

@nordicjm nordicjm merged commit 80cb1ab into nrfconnect:main Feb 25, 2025
15 of 17 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants