Upmerge 2024.12.20 #19720
Open
Upmerge 2024.12.20 #19720
+1,588
−4,903
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
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
b8faff3 to
2cd1bec
Compare
github-actions
bot
added
the
doc-required
anangl
force-pushed
the
upmerge_20241220
branch
2 times, most recently
from
e829967 to
00df919
Compare
done |
anangl
force-pushed
the
upmerge_20241220
branch
3 times, most recently
from
f315d52 to
22726df
Compare
anangl
force-pushed
the
upmerge_20241220
branch
from
22726df to
1b276e2
Compare
anangl
requested review from
sachinthegreen,
krish2718 and
a team
as code owners
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]>
Since the dependencies of `BT_ISO_CENTRAL/PERIPHERAL` options have changed and they no longer select `BT_CENTRAL/PERIPHERAL` options but rather depend on them, the latter must be explicitly enabled. Also enable the nrfx_gppi helper explicitly as the sample uses it (see controller_time_*.c). For nRF54H it will not be enabled by the UART driver like it happens for nRF52 and nRF53. Signed-off-by: Andrzej Głąbek <[email protected]>
The BUILD_ONLY flag name has been unified in upstream zephyr. Update the flags in downstream accordingly. Signed-off-by: Ravi Dondaputi <[email protected]>
-Previously there may have been a CONFIG_HOSTAP_CRYPTO_LEGACY_PSA config but this is causing build-failures. This commit updates shell-sample to use CONFIG_HOSTAP_CRYPTO_ALT_LEGACY_PSA as extra_args Signed-off-by: Frank Audun Kvamtrø <[email protected]>
-Adds des-internal.c if CONFIG_HOSTAP_CRYPTO_ENTERPRISE is set Signed-off-by: Frank Audun Kvamtrø <[email protected]>
-Setting the Mbed TLS named configuration for server name indication MBEDTLS_SSL_SERVER_NAME_INDICATION for WIFI enterprise. -Note that Zephyr has a misnamed configuration MBEDTLS_SERVER_NAME_INDICATION (missing infix label SSL_) Signed-off-by: Frank Audun Kvamtrø <[email protected]>
Enable the nrfx_gppi helper via the NRFX_GPPI option as this will cause all available PPI, DPPI, and PPIB instances to be enabled in respective drivers. Signed-off-by: Andrzej Głąbek <[email protected]>
Settings configuration should be done explicitly otherwise trusted storage fails to build. Signed-off-by: alperen sener <[email protected]>
-Changing from using CONFIG_BT_MESH_USES_TINYCRYPT to CONFIG_BT_MESH_USES_MBEDTLS_PSA for mesh tests because TinyCrypt is deprecated -Adding boards/native_sim.conf for mesh tests to enable usage of builtin Mbed TLS (nrf_security not supported): -light_ctrl -light_hue -scheduler_model/action_planning -scheduler_model/message_validity -scheduler_model/timing Signed-off-by: Frank Audun Kvamtrø <[email protected]>
-Fixes issues with some zephyr-located tests for BLE mesh. Signed-off-by: Frank Audun Kvamtrø <[email protected]>
-QEMU target is not setting SOC_FAMILY_NORDIC_NRF so it doesn't build with PSA crypto enabled. Disabling qemu_cortex_m3 for: -light_ctrl -light_hue -sensor_subsys -silvair_enocean_model Signed-off-by: Frank Audun Kvamtrø <[email protected]>
Application `applications.connectivity_bridge` reports FLASH overflow. Refers: NCSDK-31534 Signed-off-by: Katarzyna Giądła <[email protected]>
The dfu_target uses suit_dfu library and does not use SSF services directly. Ref: NCSDK-31359 Signed-off-by: Tomasz Chyrowicz <[email protected]>
Since envelope info library includes directly the platform error header, it is far easier to link them in CMake than remember to manually link platform error with each file that uses envelope info interface. Ref: NCSDK-31359 Signed-off-by: Tomasz Chyrowicz <[email protected]>
The test uses SSF interface mock instead, so disable the SSF to avoid two implementations of the same interface. Ref: NCSDK-31359 Signed-off-by: Tomasz Chyrowicz <[email protected]>
Those fail to build due to RAM overflows. Signed-off-by: Andrzej Głąbek <[email protected]>
sntp_query()'s time parameter was renamed to ts so corresponding change needed to cmock usage. Signed-off-by: Tommi Rantanen <[email protected]>
- Set missing configs to get tests running - Changed define for broadcast_code as per migration guide - OCT-3172
Fixes an issue with this test wrongly using 0 as the area size Signed-off-by: Jamie McCrae <[email protected]>
Output uses logging, which has no guarantee of even being enabled or supported Signed-off-by: Jamie McCrae <[email protected]>
- `native_sim/native` needs to be used now instead of `native_sim` - add entries for failing samples and tests that are to be handled after the upmerge: * sample.mcumgr.smp_svr.ram_load.* * nrf_modem_dect_phy_pcc_event * secure_storage.psa.its.secure_storage.* * sample.net.prometheus - remove `native_posix` Signed-off-by: Maciej Perkowski <[email protected]> Signed-off-by: Andrzej Głąbek <[email protected]>
So far when building for nRF54L15 static DPPI channels were assigned. After adding nRF54L15 support in the DPPI driver this code is unused for nRF54L15 and the common DPPI allocator used hardcoded DPPIC instance. This commit parameterizes the DDPIC instance number depending on the SoC and enables the coresponding instances in the ESB samples' configurations. ESB uses hardcoded instance number per SoC. TODO: Allow selection of the DPPIC instance in one place e.g. Kconfig based on the DTS. Signed-off-by: Michał Grochala <[email protected]>
- Change posix names to zsock. - Remove CONFIG_x_NRF_HW_ASYNC usage. - Correct size for the external flash. Signed-off-by: Markus Lassila <[email protected]>
Function has been deprecated in upstream zephyr, so remove from here. Signed-off-by: Sean Madigan <[email protected]>
Let HOSTAP_CRYPTO_ALT_LEGACY_PSA select MBEDTLS_MD5_C so that md5 related calls are available when crypto_alt is used. Signed-off-by: Ravi Dondaputi <[email protected]>
In scan_only build we need to override the sysbuild config option as well. By default it gets set to SB_CONFIG_WIFI_NRF70_SYSTEM_MODE which enables supplicant. Overriding this with SB_CONFIG_WIFI_NRF70_SCAN_ONLY fixes this. Signed-off-by: Ravi Dondaputi <[email protected]>
The ZMS implementation of the ITS store module is not supported when partition manager is used because the DT chosen `secure_storage_its_partition` cannot be used. This would require using a different, partition manager-specific configuration. As partition manager will be replaced this combination is just not supported. Signed-off-by: Tomi Fontanilles <[email protected]>
anangl
force-pushed
the
upmerge_20241220
branch
from
96cadc4 to
fbb08db
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
test_crypto: PR-750
test_suit_dfu: PR-450
test_tfm: PR-194
test_secdom_samples_public: NCSDK-NONE_upmerge_jan2025
test_audio: PR-294