[DNM]: Upmerge TF-M 2.1.0 Mbed TLS 3.6.0 #2016
Open
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_microchip
manifest-trusted-firmware-m
manifest-zcbor
manifest-hal_espressif
manifest-littlefs
manifest-mbedtls
manifest-acpica
manifest-libmetal
manifest-hal_atmel
manifest-open-amp
manifest-hal_st
manifest-uoscore-uedhoc
manifest-sof
manifest-hostap
manifest-hal_altera
manifest-lz4
manifest-tf-m-tests
manifest-hal_intel
manifest-hal_silabs
manifest-net-tools
manifest-hal_nxp
manifest-hal_nordic
manifest-hal_renesas
manifest-hal_ti
manifest-trusted-firmware-a
manifest-hal_stm32
labels
Makes the boot banner function weak, this resolves an issue when building with llext enabled which uses different build options than a normal zephyr build Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
…ken from dt Currently a user, or a shield definition, must select a Kconfig to signal that the iovdd_ctrl and bucken GPIOs are connected to the same pin. We can instead check this in the driver by simply checking if the iovdd_ctrl_spec and bucken_spec are the same pin. Update the nrfwifi driver and remove the redundant NRF_WIFI_COMBINED_BUCKEN_IOVDD_GPIO config. Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no> Upstream PR: zephyrproject-rtos/zephyr#78485
In NCS to leverage HW acceleration, use nRF security. Also, fix Kconfig warnings in NCS compliance for CRYPTO_ALT. Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
External flash support is still WIP, so, to get sysbuild working add dummy Kconfig options. Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
fixup! [nrf noup] mbedtls: Add dependency logic for PSA crypto configurations -Selecting CHACHA20 key type if PSA_WANT_ALG_STREAM_CIPHER is enabled (fixup of commit 47a1e03) Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
Although ZVFS is experimental, the warning is annoying the matter team. Therefore, remove the experimental selection. This may be reverted once upstream unselects experimental. Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
This should be removed once zephyrproject-rtos/open-amp#21 is merged. Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
External projects building the documentation may not clone all modules, as they have manifest filtering. Therefore, not having access to a module should not produce a fatal documentation build error. Convert the error to a debug log, so it is at least traced. Upstream PR: zephyrproject-rtos/zephyr#78876 Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com> Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
-Enabling MBEDTLS_ECP_DP_SECP256R1_ENABLED curve type to ensure we don't get error-warnings about MBEDTLS_ECP_C dependencies not being met for WIFI samples. Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
[SHEL-2054] Adding a kconfig option for WMM. By default it will be enabled. If user needs to disable it, set it as n. Tagged as "noup" because I had to fix a conflict because of another "noup". Upstream PR: zephyrproject-rtos/zephyr#76754 Signed-off-by: Kapil Bhatt <kapil.bhatt@nordicsemi.no>
…d FAE table Adds HCI support for: - LE CS Read Remote Supported Capabilities - LE CS Read Remote FAE Table Callbacks have been added to the conn object to allow upper layers to make use of the cache commands, with which it will be possible to store this information and provide it again in the case of a disconnect and reconnect to the same device. Upstream PR: zephyrproject-rtos/zephyr#78455 Signed-off-by: Olivier Lesage <olivier.lesage@nordicsemi.no>
Adds HCI support for the LE CS Test command. Upstream PR: zephyrproject-rtos/zephyr#78455 Signed-off-by: Olivier Lesage <olivier.lesage@nordicsemi.no>
Some of the http_server tests suites were missing netif dependency. Upstream PR: zephyrproject-rtos/zephyr#78977 Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
-We don't use this mechanism in nRF Connect SDK Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
…nload -We handle legacy Crypto API support specially (favoring PSA crypto) the tests here require MD interface to build, which needs the config MBEDTLS_LEGACY_CRYPTO_C to be enable to get access to Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
-This adds crypto support for ipv6 tests by enabling CONFIG_MBEDTLS_LEGACY_CRYPTO_C Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
Reorder functions in order to remove forward function defitions. No functional changes. Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no> (cherry picked from commit 2c78a4d)
When the queue is full, all messages posted inside interrupt handlers are simply dropped. This problem can be remedied by having the message queue large enough, but determining the maximum number of messages that can ever be posted in the system is really complex task. Hopefully in DWC2 driver there is finite number of events that have to be processed inside thread handler. Therefore it is unnecessary to determine the maximum queue size for the events if the events are posted to k_event object instead of send to k_msgq object. Use combination of three k_event structures to handle all possible event sources. This not only guarantees by design that no event will be lost, but also slightly reduces the memory usage. Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no> (cherry picked from commit c2f2d8c)
UDC API handlers and DWC2 driver thread share not only software constructs, but also the underlying hardware. Ensure that any UDC API call is not preempted by DWC2 driver thread (and vice versa) by acquiring the lock in thread handler. Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no> (cherry picked from commit 5fc0405)
Enter hibernation in thread context with the lock held to make sure to not queue any transfers when the core is hibernated. Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no> (cherry picked from commit f765026)
The PMU is not reset by core reset and therefore it is necessary to exit hibernation on DWC2 disable to prevent endless PMU interrupt loop when the driver is enabled again. Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no> (cherry picked from commit b89b7ed)
Add missing GHWCFG2 and GHWCFG3 defines based on nRF54H20 registers documentation. Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no> (cherry picked from commit 68b8818)
According to USB 2.0 Specification the remote wakeup device must hold the resume signaling for at least 1 ms but for no more than 15 ms. The DWC2 otg controller requires the software to drive the remote wakeup signalling for appropriate duration (when LPM is disabled, which is currently always the case in udc_dwc2). Arbitrarily choose to drive the resume signalling for 2 ms to have sufficient margin in both directions. Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no> (cherry picked from commit ac7d55b)
-base64 API belongs to the Mbed TLS deliverable. This avoids taking in the duplicated APIs from hostap Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
frkv
force-pushed
the
upmerge-TF-M-2.1-mbedtls-3.6
branch
from
2d6c101 to
487fbab
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.
Not for review purposes, only for CI
Please do not review