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

Align to support nRF2 clock control API #17019

Merged
merged 2 commits into from
Aug 29, 2024

Conversation

bjarki-andreasen
Copy link
Contributor

@bjarki-andreasen bjarki-andreasen commented Aug 26, 2024

The new nRF2 clock control API is enabled by default for the nRF54H20 CPUAPP as it is used to initialize the HSFLL clock. This requires two changes to sdk-nrf:

  • Don't enable MPSL clock control driver for nRF54HX as it is not supported for this platform. It was previously enabled if CLOCK_CONTROL and MPSL was enabled.
  • The CPUAPP base image is a bit larger now with the addition of the API, which results in it not fitting the recovery partition set aside in the SUIT smp_transfer sample (overrun by 1200 bytes), so the partitions have been adjusted to fit the app.

@github-actions github-actions bot added the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Aug 26, 2024
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Aug 26, 2024

CI Information

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

Inputs:

Sources:

sdk-nrf: PR head: fc0337b87a6c0d1c755ee7793197bf57364f61de
zephyr: PR head: 28b6861211d2d9f54411ff60357a42d84a253600

more details

sdk-nrf:

PR head: fc0337b87a6c0d1c755ee7793197bf57364f61de
merge base: 32b91a8fe62d6c2c86d076344c03cbb79f5e91b2
target head (main): 32b91a8fe62d6c2c86d076344c03cbb79f5e91b2
Diff

zephyr:

PR head: 28b6861211d2d9f54411ff60357a42d84a253600
merge base: a415e2d702d5192ffdf7ddf67fa73f8fab70a277
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 (42)
drivers
│  ├── mpsl
│  │  ├── clock_control
│  │  │  │ Kconfig
west.yml
zephyr
│  ├── boards
│  │  ├── nordic
│  │  │  ├── nrf54h20dk
│  │  │  │  ├── nrf54h20dk_nrf54h20-common.dtsi
│  │  │  │  ├── nrf54h20dk_nrf54h20_cpuapp.dts
│  │  │  │  ├── nrf54h20dk_nrf54h20_cpuppr.dts
│  │  │  │  │ nrf54h20dk_nrf54h20_cpurad.dts
│  │  │  ├── thingy53
│  │  │  │  │ Kconfig.defconfig
│  ├── drivers
│  │  ├── clock_control
│  │  │  ├── CMakeLists.txt
│  │  │  ├── Kconfig.nrf
│  │  │  ├── clock_control_nrf2_common.c
│  │  │  ├── clock_control_nrf2_common.h
│  │  │  ├── clock_control_nrf2_fll16m.c
│  │  │  ├── clock_control_nrf2_hfxo.c
│  │  │  ├── clock_control_nrf2_hsfll.c
│  │  │  │ clock_control_nrf2_lfclk.c
│  ├── dts
│  │  ├── bindings
│  │  │  ├── clock
│  │  │  │  ├── fixed-clock.yaml
│  │  │  │  ├── nordic,nrf-fll16m.yaml
│  │  │  │  ├── nordic,nrf-lfclk.yaml
│  │  │  │  ├── nordic,nrf54h-hfxo.yaml
│  │  │  │  │ nordic,nrf54h-lfxo.yaml
│  │  ├── common
│  │  │  ├── nordic
│  │  │  │  │ nrf54h20.dtsi
│  ├── include
│  │  ├── zephyr
│  │  │  ├── drivers
│  │  │  │  ├── clock_control
│  │  │  │  │  │ nrf_clock_control.h
│  ├── modules
│  │  ├── hal_nordic
│  │  │  ├── nrfs
│  │  │  │  ├── dvfs
│  │  │  │  │  ├── Kconfig
│  │  │  │  │  ├── ld_dvfs_handler.c
│  │  │  │  │  │ ld_dvfs_handler.h
│  ├── samples
│  │  ├── boards
│  │  │  ├── nrf
│  │  │  │  ├── nrf2_clock_control
│  │  │  │  │  ├── CMakeLists.txt
│  │  │  │  │  ├── Kconfig
│  │  │  │  │  ├── configs
│  │  │  │  │  │  ├── cpuapp_hsfll.conf
│  │  │  │  │  │  ├── cpuapp_hsfll.overlay
│  │  │  │  │  │  ├── fll16m.conf
│  │  │  │  │  │  ├── fll16m.overlay
│  │  │  │  │  │  ├── lfclk.conf
│  │  │  │  │  │  ├── lfclk.overlay
│  │  │  │  │  │  ├── uart135.conf
│  │  │  │  │  │  │ uart135.overlay
│  │  │  │  │  ├── sample.yaml
│  │  │  │  │  ├── src
│  │  │  │  │  │  │ main.c
│  ├── soc
│  │  ├── nordic
│  │  │  │ Kconfig.defconfig
│  ├── tests
│  │  ├── drivers
│  │  │  ├── clock_control
│  │  │  │  ├── nrf2_clock_control
│  │  │  │  │  ├── CMakeLists.txt
│  │  │  │  │  ├── prj.conf
│  │  │  │  │  ├── src
│  │  │  │  │  │  │ main.c
│  │  │  │  │  │ testcase.yaml

Outputs:

Toolchain

Version: 9338b70c26
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:9338b70c26_81ed5a52d6

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

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister
    • sdk-nrf test count: 997
    • sdk-zephyr test count: 5284
  • ❌ Integration tests
    • ✅ test-sdk-audio
    • ✅ test-fw-nrfconnect-ble_samples
    • ❌ test-fw-nrfconnect-chip
    • ❌ test-fw-nrfconnect-nfc
    • ✅ test-fw-nrfconnect-nrf-iot_cloud
    • ❌ test-fw-nrfconnect-nrf-iot_thingy91
    • ❌ test-fw-nrfconnect-rs
    • ✅ test-fw-nrfconnect-fem
    • ❌ test-fw-nrfconnect-thread
    • ❌ test-fw-nrfconnect-zigbee
    • ❌ test-sdk-find-my
    • ✅ test-sdk-sidewalk
    • ❌ test-low-level
    • ✅ test-sdk-dfu
Disable integration tests
    • desktop52_verification
    • doc-internal
    • test-fw-nrfconnect-apps
    • test-fw-nrfconnect-ble_mesh
    • test-fw-nrfconnect-boot
    • test-fw-nrfconnect-nrf-iot_libmodem-nrf
    • test-fw-nrfconnect-nrf-iot_lwm2m
    • test-fw-nrfconnect-nrf-iot_mosh
    • test-fw-nrfconnect-nrf-iot_nrf_provisioning
    • 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-nrf_crypto
    • test-fw-nrfconnect-proprietary_esb
    • test-fw-nrfconnect-ps
    • test-fw-nrfconnect-rpc
    • test-fw-nrfconnect-tfm
    • test-sdk-mcuboot
    • test-sdk-pmic-samples
    • test-sdk-wifi

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

@bjarki-andreasen bjarki-andreasen marked this pull request as ready for review August 26, 2024 15:11
@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.

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Aug 27, 2024

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

Name Old Revision New Revision Diff
zephyr nrfconnect/sdk-zephyr@a415e2d nrfconnect/sdk-zephyr@28b6861 (main) nrfconnect/sdk-zephyr@a415e2d7..28b68612

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

@bjarki-andreasen bjarki-andreasen force-pushed the mpsl-clock-control-dep branch 2 times, most recently from 0d0a393 to 8514497 Compare August 27, 2024 10:27
@github-actions github-actions bot removed the manifest label Aug 27, 2024
@bjarki-andreasen bjarki-andreasen force-pushed the mpsl-clock-control-dep branch 2 times, most recently from 0b7804b to b5c49d3 Compare August 28, 2024 08:04
@bjarki-andreasen bjarki-andreasen changed the title drivers: mpsl: Add !SOC_SERIES_NRF54HX dep to CLOCK_CONTROL_MPSL Align to support nRF2 clock control API Aug 28, 2024
@ns-tolu ns-tolu added this to the 2.7.99-cs1 milestone Aug 29, 2024
The MPSL clock control driver does not support the SOC_SERIES_NRF54HX
which uses the new nrf2 clock control API, which is selected by
default if CLOCK_CONTROL is selected on the SOC level.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Update zephyr to revision 28b6861211d2d9f54411ff60357a42d84a253600

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
@NordicBuilder NordicBuilder removed the DNM label Aug 29, 2024
@carlescufi carlescufi merged commit 6945f55 into nrfconnect:main Aug 29, 2024
11 of 14 checks passed
nordic-piks added a commit to nordic-piks/sdk-nrf that referenced this pull request Aug 29, 2024
After nrfconnect#17019

Signed-off-by: Piotr Kosycarz <piotr.kosycarz@nordicsemi.no>
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-run-zephyr-twister manifest manifest-zephyr
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants