-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
anangl
wants to merge
67
commits into
nrfconnect:main
Choose a base branch
from
anangl:upmerge_20241220
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Upmerge 2024.12.20 #19720
+906
−4,304
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
anangl
force-pushed
the
upmerge_20241220
branch
from
January 2, 2025 09:56
18c283b
to
b8faff3
Compare
#19200 should be merged first (other repos need the same update, will open PRs) |
3efae06 should be added here (I assume upstream BICR tooling is part of this upmerge) |
anangl
force-pushed
the
upmerge_20241220
branch
from
January 3, 2025 12:35
b8faff3
to
2cd1bec
Compare
github-actions
bot
added
the
doc-required
PR must not be merged without tech writer approval.
label
Jan 3, 2025
anangl
force-pushed
the
upmerge_20241220
branch
2 times, most recently
from
January 3, 2025 16:43
e829967
to
00df919
Compare
done |
anangl
force-pushed
the
upmerge_20241220
branch
3 times, most recently
from
January 10, 2025 08:23
f315d52
to
22726df
Compare
anangl
force-pushed
the
upmerge_20241220
branch
from
January 10, 2025 09:00
22726df
to
1b276e2
Compare
anangl
requested review from
sachinthegreen,
krish2718 and
a team
as code owners
January 10, 2025 09:00
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
force-pushed
the
upmerge_20241220
branch
3 times, most recently
from
January 24, 2025 17:07
50eee4f
to
ac50205
Compare
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]>
anangl
force-pushed
the
upmerge_20241220
branch
from
January 25, 2025 10:01
ac50205
to
54a0376
Compare
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]>
anangl
force-pushed
the
upmerge_20241220
branch
from
January 25, 2025 10:02
54a0376
to
2376528
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
ble mesh
Label for ble mesh PRbot. Add this if PR is related to ble mesh and you need to get review.
CI-force-downstream
DNM
doc-required
PR must not be merged without tech writer approval.
manifest
manifest-dragoon
manifest-find-my
manifest-matter
manifest-mbedtls
manifest-mcuboot
manifest-nrfxlib
manifest-sidewalk
manifest-suit-processor
manifest-zephyr
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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