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.

Sign up for GitHub

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

Jump to bottom

Integrate nrfx 3.2.0 #12560

Merged
merged 6 commits into from
Oct 27, 2023
Merged

Integrate nrfx 3.2.0 #12560

merged 6 commits into from
Oct 27, 2023

Conversation

nika-nordic
Copy link
Contributor

@nika-nordic nika-nordic commented Oct 6, 2023 •
edited
Loading

@nika-nordic nika-nordic added this to the 2.5.0 milestone Oct 6, 2023
@CLAassistant
Copy link

CLAassistant commented Oct 6, 2023 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@github-actions github-actions bot added changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. manifest labels Oct 6, 2023
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Oct 6, 2023 •
edited
Loading

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

Name Old Revision New Revision Diff
find-my nrfconnect/sdk-find-my@v2.5.0 https://github.com/nrfconnect/sdk-find-my/commit/b972afd32f2b6ab028320badb2e35f857b8fc158 (main) nrfconnect/sdk-find-my@v2.5.0..b972afd3
matter nrfconnect/sdk-connectedhomeip@012240f nrfconnect/sdk-connectedhomeip@608a53e (master) nrfconnect/sdk-connectedhomeip@012240f5..608a53ee
mcuboot nrfconnect/sdk-mcuboot@v1.10.99-ncs1 nrfconnect/sdk-mcuboot@adab597 (main) nrfconnect/sdk-mcuboot@v1.10.99-ncs1..adab597a
trusted-firmware-m nrfconnect/sdk-trusted-firmware-m@v1.8.0-ncs1 nrfconnect/sdk-trusted-firmware-m@6854dd5 (master) nrfconnect/sdk-trusted-firmware-m@v1.8.0-ncs1..6854dd50
zephyr nrfconnect/sdk-zephyr@v3.4.99-ncs1 nrfconnect/sdk-zephyr@9087949 (main) nrfconnect/sdk-zephyr@v3.4.99-ncs1..90879494

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

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Oct 6, 2023 •
edited
Loading

Test specification

CI/Jenkins/NRF

  • Integration Platforms

CI/Jenkins/integration

Test Module File based changes Manually selected West overwrite
desktop52_verification X
test-ci-nrfconnect-boot-fw-update X
test-fw-nrfconnect-ble X
test-fw-nrfconnect-ble_samples X
test-fw-nrfconnect-chip X
test-fw-nrfconnect-fem X
test-fw-nrfconnect-nrf-iot_cloud X
test-fw-nrfconnect-nrf-iot_mosh X
test-fw-nrfconnect-nrf-iot_positioning X
test-fw-nrfconnect-nrf-iot_thingy91 X
test-fw-nrfconnect-nrf-iot_zephyr_lwm2m X
test-fw-nrfconnect-rpc X
test-fw-nrfconnect-rs X
test-fw-nrfconnect-tfm X
test-fw-nrfconnect-thread X
test-fw-nrfconnect-zigbee X
test-sdk-find-my X
test-sdk-homekit X
test-sdk-sidewalk X

test-ci-nrfconnect-boot-fw-update: added because there was no .github/test-spec.yml in 'mcuboot'
test-fw-nrfconnect-chip: added because there was no .github/test-spec.yml in 'matter'
test-fw-nrfconnect-tfm: added because there was no .github/test-spec.yml in 'trusted-firmware-m'
test-sdk-find-my: added because there was no .github/test-spec.yml in 'find-my'

Detailed information of selected test modules

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. It will be updated about 10 minutes after the documentation build succeeds.

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

@github-actions github-actions bot added the doc-required PR must not be merged without tech writer approval. label Oct 9, 2023
@nika-nordic nika-nordic force-pushed the integrate_nrfx_3_2_0 branch 2 times, most recently from a1821e6 to 8735943 Compare October 9, 2023 11:32
@nika-nordic nika-nordic force-pushed the integrate_nrfx_3_2_0 branch 2 times, most recently from 19432a6 to d66c7f5 Compare October 10, 2023 10:40
@nika-nordic
Copy link
Contributor Author

CI status - there are two failures:

  • test-sdk-find-my - missing nrf_power alignment, will be fixed on next CI run
  • test-fw-nrfconnect-zigbee - runtime issue, reason unknown, waiting for support from Zigbee maintainers

@github-actions github-actions bot removed the doc-required PR must not be merged without tech writer approval. label Oct 12, 2023
@nika-nordic nika-nordic force-pushed the integrate_nrfx_3_2_0 branch 2 times, most recently from 72ead35 to 9ff9d8e Compare October 27, 2023 08:28
@NordicBuilder NordicBuilder removed the DNM label Oct 27, 2023
@nika-nordic
manifest: update sdk-trusted-firmware-m revision
82ba7f2 
Updated sdk-trusted-firmware-m has atomics defined for
nrfx port to solve nrfx 3.2.0 nrfx_uarte dependency.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
@nordicjm
Copy link
Contributor

Seeing 136 failures (and counting) in my PR which updates sdk-zephyr manifest, assuming this will fix them? https://jenkins-ncs.nordicsemi.no/job/latest/job/sdk-nrf/job/PR-12856/2/

@nordicjm
Copy link
Contributor

Or can you just update sdk-zephyr commit to 908794942947d049b61603b728f8f15af17e4873 as this would vastly speed up CI runs

@nika-nordic
Copy link
Contributor Author

Seeing 136 failures (and counting) in my PR which updates sdk-zephyr manifest, assuming this will fix them? https://jenkins-ncs.nordicsemi.no/job/latest/job/sdk-nrf/job/PR-12856/2/

I guess this PR should fix them, as it aligns all affected modules to API change in nrfx.

Or can you just update sdk-zephyr commit to 908794942947d049b61603b728f8f15af17e4873 as this would vastly speed up CI runs

should I do it now or wait for the PR CI to finish?

@nordicjm
Copy link
Contributor

should I do it now or wait for the PR CI to finish?

Since only 10 minutes into a possible 2 hour CI run, now please :)

@nika-nordic
manifest: update sdk-zephyr revision
11c6bcb 
Updated sdk-zephyr revision pulls in nrfx 3.2.0 integration.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
@nika-nordic
manifest: update mcuboot revision to disable GPIO int in GPIO driver
6c23053 
MCUboot does not need to use this feature and it allows
to save memory.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
@nika-nordic
manifest: update connectedhomeip revision to use new nrf_power_gpregret
3040744 
The code was aligned to new nrf_power API related
to GPREGRET registers management.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
@nika-nordic
manifest: update sdk-find-my revision to use new nrf_power_gpregret
fa704c3 
The code was aligned to new nrf_power API related
to GPREGRET registers management.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
@nika-nordic
zigbee: osif: zb_nrf_platform: align nrf_power calls to new scheme
d127c97 
Now the API to manage GPREGRET register is unified for all devices
having one or more GPREGRET entries.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
@nika-nordic
Copy link
Contributor Author

should I do it now or wait for the PR CI to finish?

Since only 10 minutes into a possible 2 hour CI run, now please :)

done as requested :)

@nordicjm nordicjm mentioned this pull request Oct 27, 2023
Closed
@nordicjm nordicjm requested review from rlubos and 57300 October 27, 2023 09:11
@nordicjm
Copy link
Contributor

@57300 @rlubos please approve this PR in place of other one

@rlubos rlubos mentioned this pull request Oct 27, 2023
Closed
@nordicjm nordicjm merged commit e31705b into nrfconnect:main Oct 27, 2023
32 checks passed
@Damian-Nordic Damian-Nordic mentioned this pull request Oct 30, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@57300 57300 57300 approved these changes

@nordicjm nordicjm nordicjm approved these changes

@rlubos rlubos rlubos approved these changes

@anangl anangl anangl approved these changes

@carlescufi carlescufi Awaiting requested review from carlescufi

@tejlmand tejlmand Awaiting requested review from tejlmand

@tomchy tomchy Awaiting requested review from tomchy

@sebastiandraus sebastiandraus Awaiting requested review from sebastiandraus

@gmarull gmarull Awaiting requested review from gmarull

Assignees
No one assigned
Labels
changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. manifest manifest-find-my manifest-homekit manifest-matter manifest-mcuboot manifest-trusted-firmware-m manifest-zephyr
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@nika-nordic @CLAassistant @NordicBuilder @nordicjm @anangl @rlubos @57300 @rakons