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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

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
zephyr nrfconnect/sdk-zephyr@80cc531 nrfconnect/sdk-zephyr#2510 nrfconnect/sdk-zephyr#2510/files

DNM label due to: 1 project with PR revision

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: 4

Inputs:

Sources:

sdk-nrf: PR head: 6f9afea232ec6238b6b682c2013777570741058e
zephyr: PR head: 80554ef34339d373d94865cd22de581991c0c143

more details

sdk-nrf:

PR head: 6f9afea232ec6238b6b682c2013777570741058e
merge base: df8f63cc6b881dd2f78e1d2b8032cf084c8b9d07
target head (main): 4964be4fa3ed7abc4fe3d84fc97ca6b665a98f5e
Diff

zephyr:

PR head: 80554ef34339d373d94865cd22de581991c0c143
merge base: 80cc5318ea91317d25fdeffb70e59507d68a1966
target head (main): a2b33714ee8e918eddb102012e2c45f90f9c742d
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 (22)
modules
│  ├── trusted-firmware-m
│  │  ├── tfm_boards
│  │  │  ├── include
│  │  │  │  ├── zephyr
│  │  │  │  │  │ kernel.h
west.yml
zephyr
│  ├── boards
│  │  ├── nordic
│  │  │  ├── nrf54l09pdk
│  │  │  │  ├── Kconfig.defconfig
│  │  │  │  │ nrf54l09_cpuapp_common.dtsi
│  │  │  ├── nrf54l20pdk
│  │  │  │  ├── Kconfig.defconfig
│  │  │  │  │ nrf54l20_cpuapp_common.dtsi
│  ├── cmake
│  │  ├── mcuboot.cmake
│  │  ├── modules
│  │  │  │ FindHostTools.cmake
│  ├── drivers
│  │  ├── counter
│  │  │  │ counter_nrfx_timer.c
│  ├── dts
│  │  ├── common
│  │  │  ├── nordic
│  │  │  │  ├── nrf54l09.dtsi
│  │  │  │  ├── nrf54l20.dtsi
│  │  │  │  │ nrf54l_05_10_15.dtsi
│  ├── include
│  │  ├── zephyr
│  │  │  ├── drivers
│  │  │  │  ├── clock_control
│  │  │  │  │  │ nrf_clock_control.h
│  ├── modules
│  │  ├── hal_nordic
│  │  │  ├── nrfx
│  │  │  │  │ CMakeLists.txt
│  ├── samples
│  │  ├── bluetooth
│  │  │  ├── bap_unicast_client
│  │  │  │  ├── src
│  │  │  │  │  │ stream_tx.c
│  │  │  ├── cap_acceptor
│  │  │  │  ├── src
│  │  │  │  │  ├── cap_acceptor_unicast.c
│  │  │  │  │  │ main.c
│  │  │  ├── cap_initiator
│  │  │  │  ├── src
│  │  │  │  │  ├── cap_initiator_unicast.c
│  │  │  │  │  │ main.c
│  ├── soc
│  │  ├── nordic
│  │  │  ├── common
│  │  │  │  │ soc_nrf_common.h
│  │  │  ├── nrf54l
│  │  │  │  │ soc.c
│  ├── tests
│  │  ├── kernel
│  │  │  ├── timer
│  │  │  │  ├── timer_api
│  │  │  │  │  ├── src
│  │  │  │  │  │  │ main.c

Outputs:

Toolchain

Version: 4cff34261a
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:4cff34261a_bece0367df

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

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister - Skipped: Skipping Build & Test as it succeeded in a previous run: 3
  • ✅ Integration tests
    • ✅ test-sdk-audio - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-ble_samples - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-chip - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nfc - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf-iot_cloud - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf-iot_thingy91 - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf_crypto - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-rs
    • ✅ test-fw-nrfconnect-fem - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-tfm - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-thread - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-sdk-find-my - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-sdk-sidewalk - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-low-level - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-sdk-dfu - Skipped: Job was skipped as it succeeded in a previous run
Disabled integration tests
    • desktop52_verification
    • doc-internal
    • test_ble_nrf_config
    • test-fw-nrfconnect-apps
    • test-fw-nrfconnect-ble_mesh
    • test-fw-nrfconnect-boot
    • 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_zephyr_lwm2m
    • test-fw-nrfconnect-proprietary_esb
    • test-fw-nrfconnect-ps
    • test-fw-nrfconnect-rpc
    • test-fw-nrfconnect-zigbee
    • test-sdk-mcuboot
    • test-sdk-pmic-samples
    • 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.

Update in nrf54l/soc.c to get rid of TFM specific changes.

Signed-off-by: Krzysztof Chruściński <[email protected]>
Add errno.h to the kernel.h used for TFM builds.

Signed-off-by: Krzysztof Chruściński <[email protected]>
@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/

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. DNM manifest manifest-zephyr
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants