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

Upmerge 2024.12.20 #19720

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

Upmerge 2024.12.20 #19720

wants to merge 54 commits into from

Conversation

anangl
Copy link
Contributor

@anangl anangl commented Jan 2, 2025

Pull in upmerged revisions of zephyr and mcuboot.

test_low_level: PR-1765
test_rs: PR-1483
test_fem: PR-1483
test_ble_mesh: ble_mesh_upmerge_test

@anangl anangl requested a review from a team as a code owner January 2, 2025 07:11
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Jan 2, 2025

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

Name Old Revision New Revision Diff
dragoon f4f268ce33699c0889e295520777b00a93aab5a3 develop/DRGN-23817_adapt_for_upmerge_20241220 N/A
find-my https://github.com/nrfconnect/sdk-find-my/commit/75b94d3e9b8abe038d38ed9f8b233155b9b06722 (main) https://github.com/nrfconnect/sdk-find-my/pull/260 nrfconnect/sdk-find-my#260/files
matter nrfconnect/sdk-connectedhomeip@7e94f1c nrfconnect/sdk-connectedhomeip#528 nrfconnect/sdk-connectedhomeip#528/files
mcuboot nrfconnect/sdk-mcuboot@99d4ae9 (main) nrfconnect/sdk-mcuboot#393 nrfconnect/sdk-mcuboot#393/files
nrfxlib nrfconnect/sdk-nrfxlib@6660641 (main) nrfconnect/sdk-nrfxlib#1640 nrfconnect/sdk-nrfxlib#1640/files
sidewalk nrfconnect/sdk-sidewalk@f274ce8 nrfconnect/sdk-sidewalk#673 nrfconnect/sdk-sidewalk#673/files
zephyr nrfconnect/sdk-zephyr@76a46cb (main) nrfconnect/sdk-zephyr#2411 nrfconnect/sdk-zephyr#2411/files

DNM label due to: 6 projects with PR revision and 1 unreachable repo

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

@gmarull
Copy link
Member

gmarull commented Jan 2, 2025

#19200 should be merged first (other repos need the same update, will open PRs)

@gmarull
Copy link
Member

gmarull commented Jan 2, 2025

3efae06 should be added here (I assume upstream BICR tooling is part of this upmerge)

@anangl anangl requested review from a team as code owners January 3, 2025 12:35
@github-actions github-actions bot added the doc-required PR must not be merged without tech writer approval. label Jan 3, 2025
@anangl anangl force-pushed the upmerge_20241220 branch 2 times, most recently from e829967 to 00df919 Compare January 3, 2025 16:43
@anangl anangl requested review from a team as code owners January 3, 2025 16:50
@anangl
Copy link
Contributor Author

anangl commented Jan 3, 2025

3efae06 should be added here (I assume upstream BICR tooling is part of this upmerge)

done

@thst-nordic thst-nordic self-requested a review January 6, 2025 13:27
@anangl anangl requested a review from a team as a code owner January 7, 2025 12:43
@anangl anangl force-pushed the upmerge_20241220 branch 3 times, most recently from f315d52 to 22726df Compare January 10, 2025 08:23
@anangl anangl requested review from a team as code owners January 10, 2025 08:23
@anangl anangl requested review from sachinthegreen, krish2718 and a team as code owners January 10, 2025 09:00
anangl and others added 28 commits January 22, 2025 16:08
This region region is no longer enabled by default.
It must be enabled explicitly when actually used.

Signed-off-by: Andrzej Głąbek <[email protected]>
LE legacy pairing is no longer enabled by default. Samples that
use it, need to disable the BT_SMP_SC_PAIR_ONLY Kconfig option.
See Zephyr PR 73217.

Signed-off-by: Andrzej Głąbek <[email protected]>
SUIT unit tests rely on the automatically assigned volatile key IDs.
Since the key IDs changes with the amount of allowed keys, we should not
change it without regenerating all test payloads.
The new Zephyr brings a Kconfig to control this variable and changes the
default amount from 32 to 16, so the SUIT test platform needs to
override it back to the previous default value.

Ref: NCSDK-31359

Signed-off-by: Tomasz Chyrowicz <[email protected]>
Commit adapts configuration ble mesh, trusted storage and
mbedtls psa parameters to be able to run mesh samples
and tests.

Signed-off-by: Aleksandr Khromykh <[email protected]>
Remove `zephyr,priority` as it is not needed after switching to
ipc,icbmsg.

Signed-off-by: Maciej Baczmanski <[email protected]>
hostap has now removed support for CRYTPO, only CRYPTO_ALT is supported
as the MbedTLS shim.

Switch to ALT version of legacy PSA for TF-M/54L builds.

Signed-off-by: Chaitanya Tata <[email protected]>
Add the missing legacy ALT case.

Signed-off-by: Chaitanya Tata <[email protected]>
This deprecated option was finally removed. See Zephyr PR 82398.
Remove references to it and, where needed, replace it with POSIX_API.

Signed-off-by: Andrzej Głąbek <[email protected]>
This sample require entropy from Zephyr, in nRF54h20
this is provided by PSA RNG driver and from the secure domain.

The PSA RNG driver brings IPC dependencies which increase the
flash footprint of this sample and this was not an acceptable
increase for the mainttainers of the sample.

It was concluded that as a temporary solution this sample  will keep
using the non cryptographically secure, deterministic software RNG.

The dependency on the PRNG node needs to be removed later and it is
tracked in NCSDK-30805.

Signed-off-by: Georgios Vasilakis <[email protected]>
Use legacy recovery PRNG in SUIT recovery application since the PSA
variant consumes more memory and the recovery application is meant to be
minimal.

Ref: NCSDK-31359

Signed-off-by: Tomasz Chyrowicz <[email protected]>
Use zsock_* socket functions and related symbols instead of POSIX ones
to avoid dependency on the POSIX subsystem.

Signed-off-by: Robert Lubos <[email protected]>
Signed-off-by: Andrzej Głąbek <[email protected]>
PSA requires RNG to be enabled.

Signed-off-by: alperen sener <[email protected]>
Increasing the stack sizes for increased requirement due to MBEDTLS PSA.
And removing BT_TINYCRYPT_ECC and BT_ECC since MBEDTLS is default now.

Signed-off-by: alperen sener <[email protected]>
Quarantine nRF52832 for light ctrl sample. To be handled after
upmerged.

Signed-off-by: alperen sener <[email protected]>
For now BT stack requires an entropy source, that is delivered by the
NRF_SECURITY module.

Ref: NCSDK-31359

Signed-off-by: Tomasz Chyrowicz <[email protected]>
Enable Zephyr's ZVFS event file descriptor

Signed-off-by: Juha Ylinen <[email protected]>
One setsockopt() call was not using zsock_* socket functions.

Signed-off-by: Juha Ylinen <[email protected]>
This is needed so that the application can be built after removal
of CONFIG_NET_SOCKETS_POSIX_NAMES.

The `sleep` structure in `slm_at_commands.c` was renamed because
it conflicted with the POSIX function `sleep()`.

Signed-off-by: Andrzej Głąbek <[email protected]>
Renamed cdc-acm-uart node to board-cdc-acm-uart node due to the
changes in the Zephyr.

Jira: NCSDK-31374

Signed-off-by: Mateusz Kapala <[email protected]>
Adding CONFIG_NVS for EMDS overlayfile. Without explicit config
for storage backend trusted storage fails to build.

Signed-off-by: alperen sener <[email protected]>
…ions

... so that lwm2m_integration.c that uses POSIX socket functions can be
compiled after removal of CONFIG_NET_SOCKETS_POSIX_NAMES.

Signed-off-by: Andrzej Głąbek <[email protected]>
Enable Zephyr's ZVFS event file descriptor.

Signed-off-by: Andrzej Głąbek <[email protected]>
... that use POSIX socket functions, so that those samples can be
built after removal of CONFIG_NET_SOCKETS_POSIX_NAMES.

Signed-off-by: Andrzej Głąbek <[email protected]>
This option was removed in upstream Zephyr as no longer needed after
the PSA crypto API had been made the default one for crypto operations
in BT crypto/host modules.
See Zephyr commit da9ab6f5937c49a3c0bfc58e99799c57f9a2f6b3.

Signed-off-by: Andrzej Głąbek <[email protected]>
This Kconfig option was renamed to BT_SEND_ECC_EMULATION and then
finally removed. See Zephyr PR 84268.

Signed-off-by: Andrzej Głąbek <[email protected]>
add revision values to nrf91 an nr54h entires.
modify llext entry.
Full extended names are now required.

Signed-off-by: Maciej Perkowski <[email protected]>
- Changed to using overlay files for each application
- Updated use of upstream API
- OCT-3172

Signed-off-by: Alexander Svensen <[email protected]>
Do not treat warnings as errors while the variable may be
uninitialized for Matter Lock. In the door-lock-server
implementation, there is a warning that the C++ "optional" variable
may be uninitialized, but actually, it is wrongly interpreted by
the Zephyr toolchain.

Signed-off-by: Arkadiusz Balys <[email protected]>
@NordicBuilder
Copy link
Contributor

Memory footprint analysis revealed the following potential issues

applications.nrf_desktop.zdebug[nrf52833dongle/nrf52833]: RAM size increased by 3196[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug[nrf52833dongle/nrf52833]: ROM size increased by 9428[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug[nrf52840dongle/nrf52840]: RAM size increased by 3220[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug[nrf52840dongle/nrf52840]: ROM size increased by 9448[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug[nrf5340dk/nrf5340/cpuapp]: RAM size increased by 5437[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug[nrf5340dk/nrf5340/cpuapp]: ROM size increased by 19220[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug[nrf52840gmouse/nrf52840]: RAM size increased by 1560[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug[nrf52840gmouse/nrf52840]: ROM size increased by 11224[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug_keyboard.usb_next[nrf52840dk/nrf52840]: RAM size increased by 1660[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug_keyboard.usb_next[nrf52840dk/nrf52840]: ROM size increased by 12188[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zrelease[nrf52840dongle/nrf52840]: RAM size increased by 3168[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zrelease[nrf52840dongle/nrf52840]: ROM size increased by 8560[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zrelease[nrf52840gmouse/nrf52840]: RAM size increased by 1612[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zrelease[nrf52840gmouse/nrf52840]: ROM size increased by 10132[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug[nrf52dmouse/nrf52832]: RAM size increased by 1620[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug[nrf52dmouse/nrf52832]: ROM size increased by 11752[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug_dongle[nrf52840dk/nrf52840]: RAM size increased by 3220[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug_dongle[nrf52840dk/nrf52840]: ROM size increased by 9444[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zrelease[nrf52kbd/nrf52832]: RAM size increased by 1616[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zrelease[nrf52kbd/nrf52832]: ROM size increased by 10464[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zrelease[nrf5340dk/nrf5340/cpuapp]: RAM size increased by 5477[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zrelease[nrf5340dk/nrf5340/cpuapp]: ROM size increased by 17032[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
sample.matter.template.debug[nrf52840dk/nrf52840]: RAM size increased by 3784[B] in comparison to the main[233a9e7] branch. - link (cc: @kkasperczyk-no @ArekBalysNordic @markaj-nordic)
sample.matter.template.debug[nrf52840dk/nrf52840]: ROM size increased by 3500[B] in comparison to the main[233a9e7] branch. - link (cc: @kkasperczyk-no @ArekBalysNordic @markaj-nordic)
sample.matter.template.release[nrf52840dk/nrf52840]: RAM size increased by 3600[B] in comparison to the main[233a9e7] branch. - link (cc: @kkasperczyk-no @ArekBalysNordic @markaj-nordic)
sample.matter.template.release[nrf52840dk/nrf52840]: ROM size increased by 3840[B] in comparison to the main[233a9e7] branch. - link (cc: @kkasperczyk-no @ArekBalysNordic @markaj-nordic)
applications.nrf_desktop.zdebug.uart.kmu_provision[nrf54l15dk/nrf54l15/cpuapp]: RAM size increased by 376[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug.uart.kmu_provision[nrf54l15dk/nrf54l15/cpuapp]: ROM size increased by 19396[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug_fast_pair.gmouse[nrf52840gmouse/nrf52840]: RAM size increased by 1560[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug_fast_pair.gmouse[nrf52840gmouse/nrf52840]: ROM size increased by 7560[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zrelease[nrf54l15dk/nrf54l15/cpuapp]: RAM size increased by 376[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zrelease[nrf54l15dk/nrf54l15/cpuapp]: ROM size increased by 16352[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
sample.matter.template.release[nrf5340dk/nrf5340/cpuapp]: RAM size increased by 3669[B] in comparison to the main[233a9e7] branch. - link (cc: @kkasperczyk-no @ArekBalysNordic @markaj-nordic)
applications.nrf_desktop.zdebug.usb_next[nrf52840dk/nrf52840]: RAM size increased by 1660[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug.usb_next[nrf52840dk/nrf52840]: ROM size increased by 11952[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug[nrf52840dk/nrf52840]: RAM size increased by 1644[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug[nrf52840dk/nrf52840]: ROM size increased by 11252[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug[nrf52kbd/nrf52832]: RAM size increased by 1564[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug[nrf52kbd/nrf52832]: ROM size increased by 11448[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug_keyboard[nrf52840dk/nrf52840]: RAM size increased by 1644[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug_keyboard[nrf52840dk/nrf52840]: ROM size increased by 11552[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug_nrf21540ek[nrf52840dk/nrf52840]: RAM size increased by 1644[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug_nrf21540ek[nrf52840dk/nrf52840]: ROM size increased by 11252[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zrelease.usb_next[nrf52840dk/nrf52840]: RAM size increased by 1712[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zrelease.usb_next[nrf52840dk/nrf52840]: ROM size increased by 10564[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
sample.matter.template.debug[nrf5340dk/nrf5340/cpuapp]: RAM size increased by 3989[B] in comparison to the main[233a9e7] branch. - link (cc: @kkasperczyk-no @ArekBalysNordic @markaj-nordic)
applications.nrf_desktop.zdebug.usb_next[nrf52840gmouse/nrf52840]: RAM size increased by 1576[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug.usb_next[nrf52840gmouse/nrf52840]: ROM size increased by 11924[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug.usb_next[nrf52840dongle/nrf52840]: RAM size increased by 3236[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug.usb_next[nrf52840dongle/nrf52840]: ROM size increased by 10148[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug_keyboard.uart.kmu_provision[nrf54l15dk/nrf54l15/cpuapp]: RAM size increased by 376[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug_keyboard.uart.kmu_provision[nrf54l15dk/nrf54l15/cpuapp]: ROM size increased by 19384[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebugwithshell[nrf52840dk/nrf52840]: RAM size increased by 1644[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebugwithshell[nrf52840dk/nrf52840]: ROM size increased by 16140[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug_4llpmconn[nrf52840dongle/nrf52840]: RAM size increased by 3108[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug_4llpmconn[nrf52840dongle/nrf52840]: ROM size increased by 9460[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug_dongle.usb_next[nrf52840dk/nrf52840]: RAM size increased by 3236[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug_dongle.usb_next[nrf52840dk/nrf52840]: ROM size increased by 10144[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug_mcuboot_qspi[nrf52840dk/nrf52840]: RAM size increased by 1644[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug_mcuboot_qspi[nrf52840dk/nrf52840]: ROM size increased by 11412[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug_wwcb[nrf52840dk/nrf52840]: RAM size increased by 1644[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug_wwcb[nrf52840dk/nrf52840]: ROM size increased by 11256[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zrelease_fast_pair.keyboard[nrf52kbd/nrf52832]: RAM size increased by 1616[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zrelease_fast_pair.keyboard[nrf52kbd/nrf52832]: ROM size increased by 6396[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug[nrf52833dk/nrf52833]: RAM size increased by 3196[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug[nrf52833dk/nrf52833]: ROM size increased by 9428[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug_fast_pair.gmouse.uart.kmu_provision[nrf54l15dk/nrf54l15/cpuapp]: RAM size increased by 320[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug_fast_pair.gmouse.uart.kmu_provision[nrf54l15dk/nrf54l15/cpuapp]: ROM size increased by 19820[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug_mcuboot_smp[nrf52840dk/nrf52840]: RAM size increased by 1644[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug_mcuboot_smp[nrf52840dk/nrf52840]: ROM size increased by 11876[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug_nrf21540ek_multicore[nrf5340dk/nrf5340/cpuapp]: RAM size increased by 5437[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug_nrf21540ek_multicore[nrf5340dk/nrf5340/cpuapp]: ROM size increased by 19220[B] in comparison to the main[233a9e7] branch. - link (cc: @MarekPieta)

Note: This message is automatically posted and updated by the CI (latest/sdk-nrf/PR-19720/41)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.