Upmerge 2024.12.20 #2411
Open
Upmerge 2024.12.20 #2411
+321,299
−88,418
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
NordicBuilder
added
manifest
manifest-hal_wch
manifest-sof
manifest-hal_stm32
manifest-zcbor
manifest-hal_infineon
manifest-hal_intel
manifest-hal_adi
manifest-mcuboot
manifest-hal_xtensa
manifest-nanopb
manifest-hal_wurthelektronik
manifest-nrf_hw_models
manifest-open-amp
manifest-nrf_wifi
manifest-picolibc
manifest-liblc3
manifest-libmetal
manifest-percepio
manifest-trusted-firmware-m
manifest-hal_renesas
manifest-hal_espressif
manifest-hal_rpi_pico
manifest-hal_tdk
manifest-hal_ambiq
manifest-hal_silabs
manifest-cmsis_6
labels
Allowed toolchains was not set in 'board' metadata causing those to not build and get filtered. Fixes #83792 Signed-off-by: Anas Nashif <[email protected]> (cherry picked from commit 1f48740)
… handling Move enabling of counter to the test instead of test setup. Test may be skipped in some configurations and in that case counter shall not be started so by moving setup to the test code allows skipping test before counter is started. Signed-off-by: Krzysztof Chruściński <[email protected]> (cherry picked from commit 1ee434a6c27dc30993fa614ba55f693a40c2829e)
…e PM uart120 requires device runtime to be enable. Enable it for nrf54h20dk. When device runtime PM is used for interrupt driven and polling API then UART device is initially suspended. It means that RX is disabled. In order to enable RX device must be explicitly resumed using PM API. Test is enabling UART RX (uart_rx_enable) from counter callback (interrupt handler context). For fast instance on nrf54h20dk (uart120) it is not allowed because PM resume can only be called from the thread context. Because of that, test is skipped for uart120 and asynchronous API. Signed-off-by: Krzysztof Chruściński <[email protected]> (cherry picked from commit cc12f655c9d2313ac893d3f209747513728e5b89)
Add check for MBO feature before including the source file. Signed-off-by: Chaitanya Tata <[email protected]> (cherry picked from commit 0953ea0)
Zephyr introduced postive feature flags to make advanced features conditional but the upstream has followed a negative feature flag for advanced features, and during upmerge these two weren't reconciled. Fix the build in case advanced features are disabled. Signed-off-by: Chaitanya Tata <[email protected]> (cherry picked from commit d909634)
…ed features This feature is handy to free up some memory, so, make sure it always builds. Signed-off-by: Chaitanya Tata <[email protected]> (cherry picked from commit 7532e73)
Default is always disabled. Signed-off-by: Chaitanya Tata <[email protected]> (cherry picked from commit 819acf1)
Fixes build issue when WMM AC feature is disabled. Signed-off-by: Chaitanya Tata <[email protected]> (cherry picked from commit 2350b6b)
Remove the HCI command & event emulation layer for ECDH commands and events. This means that we always do the necessary operations in the host. The existing BT_ECC Kconfig option stays, but now gets automatically enabled when necessary (e.g. based on the BT_SMP option), which is why this commit removes so many explicit assignments in prj.conf files. Signed-off-by: Johan Hedberg <[email protected]> (cherry picked from commit 09e86f3b69b3112b96d6f89bf388d1ced982aef9)
This option only exposes internal APIs, so there should be no need to allow applications to set an explicit value. Instead, users of the API should select it through Kconfig. Signed-off-by: Johan Hedberg <[email protected]> (cherry picked from commit d3c8cb4b7918fa3683a426350ba3886bc4924d86)
Mention the removed prompt for BT_ECC in the migration guide, and also add a note about the removed HCI emulation layer to the release notes. Signed-off-by: Johan Hedberg <[email protected]> (cherry picked from commit b3c6151679cfe333625198d465ad4e5952d53b81)
…got deprecated This is a follow-up to commit 8cfad44. Replace the deprecated BT_LE_ADV_CONN macro with BT_LE_ADV_CONN_FAST_2. Signed-off-by: Andrzej Głąbek <[email protected]> (cherry picked from commit f930739acf8586e9e27ebf20bbe4df6189d348d3)
-liblc3 added a library-internal path to zephyr_interface containing a file that collides with common.h required e.g. by Mbed TLS This commit fixes build-issues by making this include-folder PRIVATE to the named library liblc3 Signed-off-by: Frank Audun Kvamtrø <[email protected]> (cherry picked from commit 2ca64a3449c3e4b6fd457a0e15c8f3a1af5de337)
-Mbed TLS requires common.h to build. The sample provides common.h in sample folder level but included the path to zephyr_interface. This commit changes the include to be sample-specific Signed-off-by: Frank Audun Kvamtrø <[email protected]> (cherry picked from commit 627d2f971db7a7e09be63518e43dd74a0b4e4f2f)
…rm_zeroize -Adding explicit include for mbedtls/platform_util.h to get acces to mbedtls_platform_zeroize in ITS. Somehow not visibile in Zephyr but it caused build issues in nRF Connect SDK. Signed-off-by: Frank Audun Kvamtrø <[email protected]> (cherry picked from commit 202c2c41ab90ab961c60f39bde68aa36bf12f562)
…he boards Bring the change that was already in place for the qemu_cortex_m3 board to all the other ones, since also nrf52840 had a similar problem (see issue #82812). Signed-off-by: Valerio Setti <[email protected]> (cherry picked from commit 9d0b1248caebcc3d25b9b548702d42ed058959e2)
The BT Host module also uses import/export PSA functions alongside the generate one, so these PSA_WANT should be added as well. Previously it happened to work only because Mbed TLS is enabling IMPORT/EXPORT internally whenever GENERATE/DERIVE is set. However the same might not be true for all PSA Crypto providers. Signed-off-by: Valerio Setti <[email protected]> (cherry picked from commit 222f8d87b546c5e91ce132449b4fd41d55ed7207)
There's no point building the sample for platforms that do not support networking, hence add netif dependency to reduce the CI execution scope. Signed-off-by: Robert Lubos <[email protected]> (cherry picked from commit 3df9b5f87340fc5f8d37ba65ff00f17b18a545b6)
Refactors the code to avoid 'unused variable' warning that is problematic for some builds. Signed-off-by: Piotr Koziar <[email protected]> (cherry picked from commit 8f83ffc302dec61a06418efa317336016e820c65)
This is a follow-up to commit 12eee61. Explicitly enable "PSA_WANT_ALG_ECB_NO_PADDING" to select the AES ECB mode that it is used in CMAC operation. This is done because CMAC uses AES-ECB, so both AES and ECB must be explicitly enabled. Previously it worked because Mbed TLS is not currently performing any check internally on this and it's just enabling ECB automatically. Signed-off-by: Andrzej Głąbek <[email protected]> (cherry picked from commit dff78b4813e8fffd28c552b66abb8c656c990a28)
…rver The unicast server does not need GATT caching and it was likely incorrectly added earlier as a dependency. Upstream PR #: 84232 Signed-off-by: Emil Gydesen <[email protected]>
… updates -Update hostap to PR nrfconnect#76 which adds support for CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG instead of relying on legacy Mbed TLS ctr_drbg and entropy APIs. This change is in line with PSA crypto entropy changes in Zephyr happening with TinyCrypt deprecation and advancement of PSA crypto mechanisms -Remove defconfigs for currently sets the Kconfigs: -CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG -CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG_ALLOW_NON_CSPRNG Upstream PR #: 84517 Signed-off-by: Frank Audun Kvamtrø <[email protected]>
…endencies -PSA_WANT_ALG_CMAC must be set for PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128 to be valid. This commit fixes this mismatch for hostap Upstream PR #: 84517 Signed-off-by: Frank Audun Kvamtrø <[email protected]>
…nfigurations
-Mbed TLS has come up with its own naming-convention with regards
to certain Mbed TLS configurations for TLS/DTLS and X.509. This
commit fixes a couple of them by depending on MBEDTLS_BUILTIN
which is set when Kconfig.tls-generic is used
1. Make MBEDTLS_PEM_CERTIFICATE_FORMAT depend on MBEDTLS_BUILTIN
The proper name for this functionaity is MBEDTL_PEM_PARSE_C and
MBEDTLS_PEM_WRITE_C
2. Make MBEDTLS_SERVER_NAME_INDICATION depend on MBEDTLS_BUILTIN
The proper name for this is MBEDTLS_SSL_SERVER_NAME_INDICATION
Upstream PR #: 84517
Signed-off-by: Frank Audun Kvamtrø <[email protected]>
nRF boards have a ROM crunch esp. with combined with Matter/networking features, as the advanced features are not essential for typical Wi-Fi operation, disable them by default. Individual samples can choose to enable it. Upstream PR #: 84940 Signed-off-by: Chaitanya Tata <[email protected]>
Non-secure variants for nRF7002 DK were removed from upstream in commit 10d4973. Revert these changes downstream, so that the NS variants are still available. Signed-off-by: Andrzej Głąbek <[email protected]>
…en built-in in PSA" This reverts commit ac6d834. Temporarily revert an upstream change that leads to a Kconfig dependency loop with MBEDTLS_CIPHER_AES_ENABLED. This is supposed to be replaced with a better fix later. Signed-off-by: Andrzej Głąbek <[email protected]>
This needs to be revisited but the newly added dependency on the entropy_generator doesn't work with nrf_security. Signed-off-by: Georgios Vasilakis <[email protected]>
This test cannot be executed with the SDFW Service Framework client started, so disable its initialization. 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
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.