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 67 commits into
base: main
Choose a base branch
from
Open

Upmerge 2024.12.20 #19720

wants to merge 67 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 d85f37138db71ea6376260fb3ed5819faa4b97ee 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
mcuboot nrfconnect/sdk-mcuboot@99d4ae9 nrfconnect/sdk-mcuboot#393 nrfconnect/sdk-mcuboot#393/files
nrfxlib nrfconnect/sdk-nrfxlib@b5c1a84 (main) nrfconnect/sdk-nrfxlib#1640 nrfconnect/sdk-nrfxlib#1640/files
sidewalk nrfconnect/sdk-sidewalk@f274ce8 nrfconnect/sdk-sidewalk#673 nrfconnect/sdk-sidewalk#673/files
suit-processor nrfconnect/suit-processor@a499bca nrfconnect/suit-processor@a1a9ef7 (main) nrfconnect/[email protected]
zephyr nrfconnect/sdk-zephyr@954583a (main) nrfconnect/sdk-zephyr#2411 nrfconnect/sdk-zephyr#2411/files

DNM label due to: 5 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
juhaylinen and others added 19 commits January 24, 2025 17:48
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]>
The BT_USE_PSA_API 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.

The BT_ECC is no longer user-configurable.
See Zephyr commit d3c8cb4b7918fa3683a426350ba3886bc4924d86.

In the client sample, add missing BT_HCI option that is the dependency
of many other BT_* options that are to be enabled.

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]>
Fix warnings in SUIT unit tests.

Ref: NCSDK-31359

Signed-off-by: Tomasz Chyrowicz <[email protected]>
The cpuapp_ram0x_region has been changed in the global dtsi file in
Zephyr and we need to align all dts overlay entries to that change.

Signed-off-by: Arkadiusz Balys <[email protected]>
In upstream zephyr BT_LE_CS_INITIATOR_SNR_CONTROL_NOT_USED
and BT_LE_CS_REFLECTOR_SNR_CONTROL_NOT_USED have been
replaced with a common BT_LE_CS_SNR_CONTROL_NOT_USED.

Signed-off-by: Sean Madigan <[email protected]>
The dependencies for ISO kconfigs have changed so now we
need to manually select CONFIG_BT_CENTRAL and
CONFIG_BT_PERIPHERAL.

Signed-off-by: Sean Madigan <[email protected]>
After switching IPC to icbmsg, the `zephyr,priority` property is
no longer present in the IPC node and there is no need to adjust
the WQ priority.

Signed-off-by: Andrzej Głąbek <[email protected]>
... as it is not used anyway. This saves some flash bytes and makes
the the mcuboot image fit its partition again.

Signed-off-by: Andrzej Głąbek <[email protected]>
- Change API and defines based on changes in upstream Zephyr
- OCT-3172

Signed-off-by: Alexander Svensen <[email protected]>
@anangl anangl force-pushed the upmerge_20241220 branch 3 times, most recently from 50eee4f to ac50205 Compare January 24, 2025 17:07
grochu and others added 4 commits January 25, 2025 11:01
The CONFIG_NRFX_GPPI symbol was only added for specific boards
but the GPPI implementation is used unconditionally on all platforms.
Align configuration files in DTM and RT to reflect this situation.

Signed-off-by: Michał Grochala <[email protected]>
To align with upstream boards that use nRF53 and nRF91 and to get
node labels for shared memory regions (cpuapp_cpunet_ipc_shm and
cpunet_cpuapp_ipc_shm) defined.

Signed-off-by: Andrzej Głąbek <[email protected]>
CONFIG_SOC_ENABLE_LFXO has been deprecated in zephyr in
favour of a DT_NODE, so update the handling of this in
empty_app_core sample.

Signed-off-by: Sean Madigan <[email protected]>
Now the function requires additional parameter with the socket number.

Signed-off-by: Andrzej Głąbek <[email protected]>
This sample uses the nrfx_gppi helper (see timed_led_toggle.c) but does
not enable it in its configuration. For nRF52 and nRF53, this module is
enabled by the UART driver, but this is not the case for nRF54H.
Enable the module explicitly to avoid such discrepancies.

Signed-off-by: Andrzej Głąbek <[email protected]>
This option was deprecated and has been finally removed.
See Zephyr PR 82722.

Signed-off-by: Andrzej Głąbek <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.