Upmerge 16 05 2024 #15421
Closed
Upmerge 16 05 2024 #15421
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
Pull upmerged sdk-zephyr and sdk-mcuboot repositories. Pull fixes in matter and find-my, sidewalk. Signed-off-by: Robert Lubos <[email protected]>
PORTING.md is now referenced by other docs, hence make sure it's visible during doc build. Signed-off-by: Robert Lubos <[email protected]>
Specifically NET_L2_BT and NET_L2_BT_SHELL. Signed-off-by: Robert Lubos <[email protected]>
d590bcb removed the CONFIG_BT_HCI_RAW_RESERVE Kconfig option. Align NCS to the change. Jira: NCSDK-27508 Signed-off-by: Marek Pieta <[email protected]>
A new calblack event (ZPERF_SESSION_PERIODIC_RESULT) has been added to zperf, just ignore it int the sample for now to prevent build warnings. Signed-off-by: Robert Lubos <[email protected]>
lwm2m_engine_set_data_cb_t callback signaure now has an additional offset parameter. Signed-off-by: Robert Lubos <[email protected]>
NCS boot banner has to be standalone entity from Zephyr boot banner. Signed-off-by: Robert Lubos <[email protected]>
MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG symbol has been added as an choice option in upstream Zephyr, which is not compatible with how nrf_security interprets the symbol. Try to fix this on the nrf_security side. Signed-off-by: Robert Lubos <[email protected]>
From the upstream migration guide: The SMF_CREATE_STATE macro now always takes 5 arguments. The amount of arguments is now independent of the values of CONFIG_SMF_ANCESTOR_SUPPORT and CONFIG_SMF_INITIAL_TRANSITION. If the additional arguments are not used, they have to be set to NULL Signed-off-by: Robert Lubos <[email protected]>
Align code after 484fe3f was added to Zephyr. Jira: NCSDK-27508 Signed-off-by: Marek Pieta <[email protected]>
18c23da removes CONFIG_BT_HCI_VS_EXT. Align BLE controller configuration with the changes. Jira: NCSDK-27508 Signed-off-by: Marek Pieta <[email protected]>
Enabling custom fatal error handler globally can be problematic for sdk-zephyr samples built in NCS context, as they may define their own handlers, causing linker error. As there's no elegant way to handle that on the sample side, other than noup patches in sdk-zephyr, disable the RESET_ON_FATAL_ERROR config by default. As an alternative for NCS, the config will now be implied by NCS_SAMPLES_DEFAULTS config, which is exclusive for NCS samples only. Additionally, enable CONFIG_REBOOT in a few samples, which rely on reboot functionality but did not enable config explicitly. Signed-off-by: Robert Lubos <[email protected]>
nRF Desktop application does not use boot banners provided by Zephyr and NCS. Jira: NCSDK-27508 Signed-off-by: Marek Pieta <[email protected]>
Having mbed TLS enabled in the system does not automatically mean it's used for HTTPS communication in memfault. If offloaded sockets are used, it's not the case regardless of mbed TLS configurations. Override the default value for MEMFAULT_HTTP_USES_MBEDTLS config in case NRF_MODEM_LIB is enabled to n. This config simply enables some extra checks for mbed TLS configuration (whether it fits memfault needs), but since it's not really used for offloaded sockets, it can generate false errors. By default, the config is set to y whenever mbed TLS is enabled, which is oversimplified condition for our case. Signed-off-by: Robert Lubos <[email protected]>
Changed rram0 dts label name to the cpuapp_rram for nrf54l15pdk board. Signed-off-by: Kamil Kasperczyk <[email protected]>
Boot banner must be disabled for nRF2220 and nRF2240 front-end modules to avoid conflicts between TWIM and UART instances on initialization. Signed-off-by: Jędrzej Ciupis <[email protected]>
Upstream commit 4760aad changed CPU idle handler from asm to C, so align with that change. Signed-off-by: Robert Lubos <[email protected]>
The external tfm_regression_test_app target failed to build because of missing psa_crypto_config library. As it was identified, the fix would be needed in the upstream repository, which we have not forked, it was agreed to work this around with PATCH_COMMAND for now. Signed-off-by: Robert Lubos <[email protected]>
OCT-3020 Resolved build issues Signed-off-by: Kristoffer Rist Skøien <[email protected]>
github-actions
bot
added
doc-required
|
The following west manifest projects have been modified in this Pull Request: Note: This message is automatically posted and updated by the Manifest GitHub Action. |
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.
No description provided.