Skip to content

Conversation

magp-nordic
Copy link
Contributor

@magp-nordic magp-nordic commented Sep 10, 2025

Based on: #24454 , only the last commit is a part of this PR. Included in this PR.

Can be reviewed, CI fixed in terms of changes related to introducing BSP. The following errors are left:

Adding nrfx to group filter is needed to make Compliance Checks green. It is overridden in Jenkins. Locally you can do it by calling west config manifest.group-filter +nrfx, so that west would fetch the internal nrfx during west update

@magp-nordic magp-nordic requested review from a team as code owners September 10, 2025 13:27
@NordicBuilder NordicBuilder added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Sep 10, 2025
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Sep 10, 2025

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

Name Old Revision New Revision Diff
nrfx 🆕 N/A (Added) https://github.com/nrfconnect/nrfx/commit/eadf25033e69b9908f36add188ac62b354914922 N/A
zephyr nrfconnect/sdk-zephyr@d792280 nrfconnect/sdk-zephyr@0c9648f (collab-nrfx-4.0) nrfconnect/[email protected]

DNM label due to: 1 added project

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

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Sep 10, 2025

CI Information

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

Inputs:

Sources:

sdk-nrf: PR head: 6ddd688fb956ff7584b54ce5c85a4456d7cb3547
zephyr: PR head: 0c9648fe64f0a4b82eaa5db7d0d1af5386cc91de

more details

sdk-nrf:

PR head: 6ddd688fb956ff7584b54ce5c85a4456d7cb3547
merge base: 43cfc50748332e6e842746808882bf7cab9f77b1
target head (collab-nrfx-4.0): 43cfc50748332e6e842746808882bf7cab9f77b1
Diff

zephyr:

PR head: 0c9648fe64f0a4b82eaa5db7d0d1af5386cc91de
merge base: d792280a1c8639ac103ce0dd094f8d5dd4e5377d
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 (14)
lib
│  ├── ram_pwrdn
│  │  │ ram_pwrdn.c
modules
│  ├── hal_nordic
│  │  ├── CMakeLists.txt
│  │  ├── nrfx
│  │  │  │ CMakeLists.txt
scripts
│  │ quarantine.yaml
tests
│  ├── drivers
│  │  ├── nrfx_integration_test
│  │  │  │ Kconfig
west.yml
zephyr
│  ├── drivers
│  │  ├── i2c
│  │  │  │ i2c_nrfx_twis.c
│  │  ├── ieee802154
│  │  │  │ ieee802154_nrf5.c
│  ├── modules
│  │  ├── hal_nordic
│  │  │  ├── nrfx
│  │  │  │  ├── CMakeLists.txt
│  │  │  │  │ nrfx_config.h
│  ├── samples
│  │  ├── boards
│  │  │  ├── nordic
│  │  │  │  ├── nrfx_prs
│  │  │  │  │  ├── src
│  │  │  │  │  │  │ main.c
│  ├── soc
│  │  ├── nordic
│  │  │  ├── CMakeLists.txt
│  │  │  ├── Kconfig
│  │  │  ├── nrf54h
│  │  │  │  ├── bicr
│  │  │  │  │  │ CMakeLists.txt

Outputs:

Toolchain

Version: 2b2cd9579a
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:2b2cd9579a_bba2ea5f2e

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

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ❌ Build twister
    • sdk-nrf test count: 22
    • sdk-zephyr test count: 1746
  • ❌ Integration tests
    • ❌ test-sdk-audio
    • ❌ test-fw-nrfconnect-chip
    • ❌ test-fw-nrfconnect-nfc
    • ❌ test-fw-nrfconnect-rs
    • ❌ test-fw-nrfconnect-fem
    • ❌ test-fw-nrfconnect-thread-main
    • ❌ test-sdk-find-my
    • ❌ test-low-level
    • ❌ test-sdk-dfu
    • ⚠️ test-fw-nrfconnect-nrf-iot_cloud
Disabled integration tests
    • test-fw-nrfconnect-nrf_lrcs_mosh
    • test-fw-nrfconnect-nrf_lrcs_positioning
    • desktop52_verification
    • test-fw-nrfconnect-apps
    • test-fw-nrfconnect-ble_mesh
    • test-fw-nrfconnect-ble_samples
    • test-fw-nrfconnect-nrf-iot_libmodem-nrf
    • test-fw-nrfconnect-nrf-iot_lwm2m
    • 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-nrf_crypto
    • test-fw-nrfconnect-proprietary_esb
    • test-fw-nrfconnect-ps-main
    • test-fw-nrfconnect-rpc
    • test-fw-nrfconnect-tfm
    • 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

Comment on lines +3 to +7

# Set path to the latest version of nrfx
set(NRFX_DIR ${CMAKE_CURRENT_LIST_DIR}/../../../nrfx/)
set(NRFX_DIR ${NRFX_DIR} CACHE STRING "Path to nrfx")

Copy link
Contributor

Choose a reason for hiding this comment

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

Why ?

And also, never assume a given Zephyr module is placed relative to another, as a west manifest could define other location. Use the module name dir location.

Copy link
Contributor Author

@magp-nordic magp-nordic Sep 12, 2025

Choose a reason for hiding this comment

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

@tejlmand, this change is from #24454 PR, which this PR is based on. Generally, it is a temporary change and is needed only for the collab-nrfx-4.0 branch, to change the nrfx directory to the internal one, which is fetched with west. If you have any more notes regarding those changes, please report them in #24454 Changes from #24454 will be merged with this PR, so we can keep the conversation here.

@magp-nordic magp-nordic requested a review from a team as a code owner September 18, 2025 14:01
@magp-nordic magp-nordic force-pushed the NRFX-8369-align-paths-to-bsp branch from 118a4f4 to 110d598 Compare September 22, 2025 11:45
@magp-nordic magp-nordic requested a review from a team as a code owner September 22, 2025 11:45
Add latest nrfx and change zephyr revision to the most recent
commit on collab-nrfx-4.0.
This is a temporary change until nrfx-4.0 is released, to
be able to test NCS CI with in-development nrfx.

Signed-off-by: Michał Bainczyk <[email protected]>
This is a temporary change until nrfx-4.0 is released, to
be able to test NCS CI with in-development nrfx.

Signed-off-by: Michał Bainczyk <[email protected]>
@nordic-piks nordic-piks added upmerge CI-all-test Run All integration tests labels Sep 25, 2025
@magp-nordic magp-nordic force-pushed the NRFX-8369-align-paths-to-bsp branch 2 times, most recently from c2c14c7 to 17e1dbf Compare September 26, 2025 08:28
@magp-nordic magp-nordic removed upmerge CI-all-test Run All integration tests labels Sep 26, 2025
magp-nordic and others added 9 commits September 26, 2025 13:05
Update sdk-zephyr hash to make it aligned to BSP changes in nrfx.

Signed-off-by: Magdalena Pastula <[email protected]>
Make MDK path dependent on BSP path, since it is now located there.

Signed-off-by: Magdalena Pastula <[email protected]>
Update nrfx with fix for nrfx_config filename for nRF7120
and nRF54LS05 and with moving inclusion of nrfx.h from
nrfx_coredep_defs.h to nrfx_coredep.h.

Signed-off-by: Magdalena Pastula <[email protected]>
Remove selecting PRS BOX other than PRS_BOX_0, as it now causes
compilation errors due to not checking if `NRFX_PRS_BOX_*_ADDR`
is defined in nrfx driver.

Signed-off-by: Magdalena Pastula <[email protected]>
NRF_POWER_RAMPOWER_S0POWER is deprecated and is to be
removed soon.

Signed-off-by: Michał Stasiak <[email protected]>
Add group filter for nrfx.

Signed-off-by: Magdalena Pastula <[email protected]>
Will be fixed in NRFX-8421.

Signed-off-by: Magdalena Pastula <[email protected]>
Add not passing thingy tests to quarantine due to exceeded flash
size after upmerge.

Signed-off-by: Magdalena Pastula <[email protected]>
Add to quarantine failing event_manager_proxy.icmsg.cpuflpr test
on nRF54LV10.

Signed-off-by: Magdalena Pastula <[email protected]>
@magp-nordic magp-nordic force-pushed the NRFX-8369-align-paths-to-bsp branch from 17e1dbf to 6ddd688 Compare September 26, 2025 11:05
@masz-nordic masz-nordic removed the DNM label Sep 26, 2025
@masz-nordic masz-nordic merged commit f79771d into nrfconnect:collab-nrfx-4.0 Sep 26, 2025
10 of 14 checks passed
@magp-nordic magp-nordic deleted the NRFX-8369-align-paths-to-bsp branch September 26, 2025 11:30
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. manifest manifest-nrfx manifest-zephyr

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants