Upmerge 2025.04.23 #2817
Open
Upmerge 2025.04.23 #2817
+409,921
−127,457
Conversation
This file contains hidden or 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-mipi-sys-t
manifest-liblc3
manifest-cmsis-nn
manifest-trusted-firmware-m
manifest-hal_stm32
manifest-hal_nxp
manifest-hal_espressif
manifest-fatfs
manifest-hal_intel
manifest-hal_silabs
manifest-hal_ti
manifest-libmetal
manifest-hal_nordic
manifest-littlefs
manifest-net-tools
manifest-tf-m-tests
manifest-lvgl
manifest-hal_tdk
manifest-nrf_wifi
manifest-hal_xtensa
manifest-hal_ambiq
manifest-zephyr-lang-rust
manifest-open-amp
manifest-hal_nuvoton
manifest-hal_rpi_pico
manifest-hostap
manifest-hal_microchip
labels
…f strlen if the provided name in argument is not null this could lead to un undefined behavior. Use strnlen to make this safe Upstream PR #: 87792 Signed-off-by: Riadh Ghaddab <[email protected]> (cherry picked from commit 4efae76)
Add references to the new API functions that were added "csi_load_one" and "csi_get_val_len" Upstream PR #: 87792 Signed-off-by: Riadh Ghaddab <[email protected]> (cherry picked from commit 85ea893)
Clean some parts of the code and refactor it to avoid multiple nested conditions. Upstream PR #: 87792 Signed-off-by: Riadh Ghaddab <[email protected]> (cherry picked from commit 749f6b5)
nrf-squash! [nrf noup] samples: basic: blinky: add eGPIO tests configuration Change names SDP and eGPIO to new names: HFP and hpf_gpio. Signed-off-by: Magdalena Pastula <[email protected]> (cherry picked from commit 1e01213)
nrf-squash! [nrf noup] drivers: pinctrl: Add SDP MSPI pin configuration Change name SDP to a new one: HPF. Signed-off-by: Magdalena Pastula <[email protected]> (cherry picked from commit a4c0f95)
Cache was not enabled when s2ram did not completed which lead to system malfunction. Always power up cache when returning from s2ram function. Upstream PR #: 88709 Signed-off-by: Krzysztof Chruściński <[email protected]> (cherry picked from commit 7607c65)
… in nRF devices This change plays with situation in nRF54L devices where XOTUNE make LF clock calibration process starts a bit longer. Now HF clock is configured to be ready right before LF calibration test. Upstream PR #: 88797 Signed-off-by: Karol Lasończyk <[email protected]> (cherry picked from commit 926f142)
…s on nRF54 Added support for audio clock for nRF54L20 and AudioPLL for nRF54H20 in DMIC PDM driver. Upstream PR #: 87105 Signed-off-by: Michał Stasiak <[email protected]> Signed-off-by: Sebastian Głąb <[email protected]> (cherry picked from commit 91f0955)
Use PPI resources information from SoftDevice when it is present. Co-authored-by: Krzysztof Chruściński <[email protected]> Signed-off-by: Eivind Jølsgard <[email protected]> (cherry picked from commit 87432d9)
… security Add support for configuring enterprise mode security. Fixes SHEL-3573. Upstream PR #: 88653 Signed-off-by: Ravi Dondaputi <[email protected]> (cherry picked from commit 5ebd033)
Enable Wi-Fi credentials support. Update the heap sizes as required for enterprise mode. Upstream PR #: 88653 Signed-off-by: Ravi Dondaputi <[email protected]> (cherry picked from commit b2c3f2c)
…P is re-enabled Add a simple non-XIP transaction before deactivating the QSPI after a XIP transaction is performed. This prevents a CPU hang from occuring when another XIP transaction is attempted after the QSPI is activated again. Upstream PR #: 88967 Signed-off-by: Andrzej Głąbek <[email protected]> (cherry picked from commit a734f84)
The PSA is a cryptographically secure random number generator. It will be enabled by default, eventually, For now, enable it manually. Signed-off-by: Gordon Klaus <[email protected]> (cherry picked from commit 07e10c6)
Add a shim that allows using the nRF TDM (Time division multiplexed audio interface) HAL by I2S Zephyr API. Upstream PR #: 82144 Signed-off-by: Adam Kondraciuk <[email protected]> (cherry picked from commit e22c042)
Some of nRF54's has TDM peripheral instead of I2S. Upstream PR #: 82144 Signed-off-by: Adam Kondraciuk <[email protected]> (cherry picked from commit 7221211)
Same as commit 6ec9d10 but with the REQUIRED keyword on its own line to attempt to avoid a merge conflict when reverting/reapplying this patch. Signed-off-by: Jonathan Nilsen <[email protected]> (cherry picked from commit 4e9869f)
…o Kconfig Moved target dependent startup time from header file to Kconfig option to allow adding new targets with new .conf file rather that modyfing source of the test. Adjusted startup time for nRF54L09 and nRF54L20. Upstream PR #: 88956 Signed-off-by: Michał Stasiak <[email protected]> (cherry picked from commit 0955031)
Also update memory map to leverage unused MRAM and move sysctrl IPC to RAM20 to free global RAM. Upstream PR #: 88932 Signed-off-by: Håkon Amundsen <[email protected]> (cherry picked from commit 246cb42)
For reasons other than system off, the retained data should be cleared. Upstream PR #: 89044 Signed-off-by: Adam Kondraciuk <[email protected]> (cherry picked from commit 128319d)
SoftAP operation needs around 5700 bytes of stack. With a buffer of 100 bytes, set the supplicant stack size to 5800. Fixes SHEL-3604. Upstream PR #: 89116 Signed-off-by: Ravi Dondaputi <[email protected]> (cherry picked from commit 5db46db)
The parameter length for this command was missing the additional length from the arrayed parameters. Upstream PR #: 89092 Signed-off-by: Olivier Lesage <[email protected]> (cherry picked from commit 59d05a4)
Initial implementation of nRF54L quirks necessary for nRF54LM20A. To be upstreamed after TODO comments are resolved. Signed-off-by: Tomasz Moń <[email protected]> (cherry picked from commit d32cb3c)
…, not select Turn the MBEDTLS_RSA_FULL selects into depends on. This is how the other MBEDTLS_KEY_EXCHANGE_* Kconfig options are defined. This is done to avoid circular dependencies. At the same time update uses of the affected MBEDTLS_KEY_EXCHANGE_* Kconfig options to enable/disable the dependencies which used to be automatically handled. Upstream PR #: 89200 Signed-off-by: Tomi Fontanilles <[email protected]> (cherry picked from commit deacfa35eb7bd9d2731ef7f16aedc9b14d1cc3b7)
Update the casting of the 'attr' parameter in pthread_cond_init to use the correct variable name 'att'. Thanks clang for spotting the typo. Signed-off-by: Benjamin Cabé <[email protected]> (cherry picked from commit f412cc643d91660b7acffacdbb6e18b100fccf7c)
|
@jfischer-no could you remove my commit and cherry-pick b4f940d654a223e8aaa283d74dddb4bdb554cf92 instead? |
jfischer-no
force-pushed
the
meta-upmerge
branch
from
ded3d75 to
bbc2dfb
Compare
Fix ethernet_hw_caps initialization in ethernet.h for strict type checking. g++-12: include/zephyr/net/ethernet.h:957:38: error: invalid \ conversion from 'int' to 'ethernet_hw_caps' [-fpermissive] Signed-off-by: Daniel Nicoletti <[email protected]> (cherry picked from commit b4f940d654a223e8aaa283d74dddb4bdb554cf92)
jfischer-no
force-pushed
the
meta-upmerge
branch
from
bbc2dfb to
a49ac90
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.
upstream-head-sha: 9a6f116
Below are dropped noup/fromlist commits that cannot be applied cleanly and I cannot resolve them because I have no clue about this area or the files upstream are removed/changed. So whoever is responsible for these patches, please take a look at them and if necessary provide me with an updated version of the patches.
@mstasiaknordic
# [nrf noup] Revert "[nrf fromlist] boards: nordic: add FLPR core to nRF54L20pdk"c63d142# [nrf noup] Revert "[nrf fromlist] modules: hal_nordic: nrfx: add nRF54L20 FLPR core"8a381ae# [nrf noup] Revert "[nrf fromlist] modules: hal_nordic: Add nRF54L09 FLPR"b717237@frkv
[nrf noup] modules: mbedtls: Disable configurations in Kconfig.tls-genericfe0996c@tomchy
[nrf fromlist] Revert "boards: nordic: Fix cpuapp_ram0x_region reg valuehttps://github.com/zephyrproject-rtos/zephyr/pull/88121/commits1bac58a
@krish2718
[nrf fromlist] nrf_wifi: Add nRF71 supportzephyrproject-rtos/zephyr#88816d8dae50
3c86e5b