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

manifest: update zephyr and tf-m with nrfx 3.1.0 integration #11800

Merged
merged 2 commits into from
Aug 17, 2023
Merged

manifest: update zephyr and tf-m with nrfx 3.1.0 integration #11800

merged 2 commits into from
Aug 17, 2023

Conversation

ankuns
Copy link
Contributor

@ankuns ankuns commented Jul 13, 2023

Brings in zephyr with cherry-picked nrfx 3.1.0 integration.

@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 Jul 13, 2023
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Jul 13, 2023 •
edited
Loading

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

Name Old Revision New Revision Diff
trusted-firmware-m nrfconnect/sdk-trusted-firmware-m@7815216 nrfconnect/sdk-trusted-firmware-m@6ad9c58 (master) nrfconnect/sdk-trusted-firmware-m@7815216d..6ad9c58f
zephyr nrfconnect/sdk-zephyr@d5254ae nrfconnect/sdk-zephyr@451c1c4 (main) nrfconnect/sdk-zephyr@d5254ae5..451c1c4b

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

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Jul 13, 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-fw-nrfconnect-ble X
test-fw-nrfconnect-ble_samples X
test-fw-nrfconnect-fem X
test-fw-nrfconnect-nfc X
test-fw-nrfconnect-nrf-iot_lwm2m X
test-fw-nrfconnect-nrf-iot_thingy91 X
test-fw-nrfconnect-nrf_crypto X
test-fw-nrfconnect-rpc X
test-fw-nrfconnect-rs X
test-fw-nrfconnect-tfm X
test-fw-nrfconnect-thread X
test-sdk-find-my X

test-fw-nrfconnect-tfm: added because there was no .github/test-spec.yml in 'trusted-firmware-m'

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.

@ankuns ankuns force-pushed the cherry_pick_nrfx_3.1.0_integration branch 5 times, most recently from 934f5f7 to affacb1 Compare July 21, 2023 06:49
@awojasinski awojasinski mentioned this pull request Aug 8, 2023
Closed
@jciupis jciupis force-pushed the cherry_pick_nrfx_3.1.0_integration branch from affacb1 to 7d499f4 Compare August 10, 2023 09:06
@frkv frkv mentioned this pull request Aug 11, 2023
Merged
@jciupis jciupis force-pushed the cherry_pick_nrfx_3.1.0_integration branch from 7d499f4 to b991513 Compare August 14, 2023 06:32
@jciupis jciupis marked this pull request as ready for review August 14, 2023 10:30
@jciupis jciupis requested review from tejlmand, a team and carlescufi as code owners August 14, 2023 10:30
@jciupis jciupis force-pushed the cherry_pick_nrfx_3.1.0_integration branch from b991513 to 27dac30 Compare August 16, 2023 10:00
@NordicBuilder NordicBuilder removed the DNM label Aug 16, 2023
@jciupis jciupis changed the title manifest: zephyr: update zephyr with nrfx 3.1.0 integration manifest: update zephyr and tf-m with nrfx 3.1.0 integration Aug 16, 2023
@ankuns
manifest: update zephyr and tf-m with nrfx 3.1.0 integration
f59f694 
This commit brings in zephyr and trusted-firmware-m with changes needed
for nrfx v3.1.0 integration.

Signed-off-by: Andrzej Kuros <andrzej.kuros@nordicsemi.no>
@ankuns
applications: nrf_desktop: quarantine due to flash overflow
ae8158d 
Disabling configurations that do not build with NRFX 3.1.0 due to
flash overflow.

Signed-off-by: Andrzej Kuros <andrzej.kuros@nordicsemi.no>
@jciupis jciupis force-pushed the cherry_pick_nrfx_3.1.0_integration branch from 27dac30 to ae8158d Compare August 16, 2023 11:43
@jciupis jciupis removed the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Aug 16, 2023
@frkv frkv self-requested a review August 16, 2023 19:31
frkv
frkv approved these changes Aug 16, 2023
View reviewed changes
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

@rlubos rlubos merged commit d3fe7f2 into nrfconnect:main Aug 17, 2023
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@frkv frkv frkv approved these changes

@jciupis jciupis jciupis approved these changes

@tejlmand tejlmand Awaiting requested review from tejlmand

@carlescufi carlescufi Awaiting requested review from carlescufi

Assignees
No one assigned
Labels
manifest manifest-trusted-firmware-m manifest-zephyr
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ankuns @NordicBuilder @frkv @jciupis @rlubos