Upmerge 2025.04.23 #2817
Merged
Upmerge 2025.04.23 #2817
+409,545
−126,663
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
…nit_hook Boot the radiocore from the app in soc_late_init_hook. Upstream PR #: 89333 Signed-off-by: Sebastian Bøe <[email protected]> (cherry picked from commit 37e28604f355d36f2ab1a8044ef92226dd303e30)
…/cpuapp/iron Add support for nrf54h20dk/nrf54h20/cpuapp/iron to the samples/sysbuild/hello_world sample. Upstream PR #: 89333 Signed-off-by: Sebastian Bøe <[email protected]> (cherry picked from commit 81234973dc7134cbc7f08c79a4622fa2c8647055)
… test nrf54h should be capable of operating the CAN interface when GPD is enabled. Signed-off-by: Bartosz Miller <[email protected]> (cherry picked from commit a1a8d28)
…RF_IRONSIDE Add a promptless symbol that can be selected by different drivers. It is there to ensure that the corresponding library is not added to the build unless it contains at least one source file. Signed-off-by: Grzegorz Swiderski <[email protected]> (cherry picked from commit 3353bbc0661e66ff78479c04c99420bff12eede6)
Events used in `call.c` should've been defined as static. Signed-off-by: Grzegorz Swiderski <[email protected]> (cherry picked from commit 52f834068a076f6b3d675fe1dbf11401f03cf081)
Applied as noup because of conflicts. Upstream PR #: 89333 Add an IPC service API for triggering updates of the Nordic IRONside SE firmware using the IRONside call module. Co-authored-by: Håkon Amundsen <[email protected]> Signed-off-by: Jonathan Nilsen <[email protected]> (cherry picked from commit cd4c148)
Upstream PR #: 89333 Enable the cpusec_bellboard by default for the cpuapp iron board variant so that IPC toward the secure domain is available by default. Because IPC is needed to boot the radio core, this fits the standard use case. Signed-off-by: Jonathan Nilsen <[email protected]> (cherry picked from commit e09a30c)
…pdate service Add a sample demonstrating how to use the IRONside update service to update the IRONside SE firmware on the nrf54h20dk/nrf54h20/cpuapp/iron board. Upstream PR #: 89333 Co-authored-by: Håkon Amundsen <[email protected]> Signed-off-by: Jonathan Nilsen <[email protected]> (cherry picked from commit a23ecf423aee9564de4972ee6f849f3a98670e2d)
…o 26 The tx-en-settle-time-us is set to 26 to take into account the time needed for the RF output power rise time of the nRF5 SoC. Signed-off-by: Andrzej Kuros <[email protected]> (cherry picked from commit 024deb49b18519a0a56dfbd53f8c708a496d52f1)
…XTO during restart Some SoCs generates unexpected RXTO event during restart. Restart happens when ENDRX_STARTRX short is enabled and STOPRX is triggered (via short or by CPU). STOPRX starts closing procedure and ENDRX event is generated at some point which triggers STARTRX and closing procedure is interrupted. RXTO should not be triggered in that case. Due to internal timings some SoC on fast UARTE instance will trigger RXTO followed by RXSTARTED. This RXTO event shall be cleared as receiver is actually restarted and not stopped. Affected SoC is not in tree so Kconfig is added which enables the workaround. Upstream PR #: 88935 Signed-off-by: Krzysztof Chruściński <[email protected]> (cherry picked from commit 2742e46)
…nect#292 Pull in zephyrproject-rtos/hal_nordic#292. Signed-off-by: Carles Cufi <[email protected]> (cherry picked from commit c5033a2a53dedb69478c0aff45d9e600b0de209c)
…, 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 f412cc6)
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 b4f940d)
…for ZLL BT_TICKER_LAZY_GET is a ZLL only kconfig and should not be selected for other controllers. Upstream PR #: 89249 Signed-off-by: Timothy Keys <[email protected]> (cherry picked from commit d82bf446937522690e02ae9a9ce4e652db0b8bb0)
…TO_PRNG PSA Crypto API always allow psa_generate_random() to be called (i.e. there is no PSA_WANT_xxx symbol that can be used to disable it). How random numbers are generated internally is a library internal detail, but the end user (Bluetooth) does not need to worry about this. Signed-off-by: Valerio Setti <[email protected]> (cherry picked from commit 52dcb2593a8991278c1ae1be0cc423b1c66a1475)
Replace `CONFIG_NET_L2_IEEE802154` with `CONFIG_NET_L2_PHY_IEEE802154` as `NET_LINK_ADDR_MAX_LENGTH` should be set to `8` for all IEEE 802.15.4 based L2, e.g. OpenThread. Signed-off-by: Adrian Gielniewski <[email protected]> (cherry picked from commit 39e051f37226d93364d7e6e3b078b3f19e1304a6)
…ning Theoretically (if either `height` or `width` in `config` is set to 0), the `ret` variable might be returned from `st7567_clear()` without being initialized. Add initialization of this variable to avoid compiler warnings. Signed-off-by: Andrzej Głąbek <[email protected]> (cherry picked from commit fee8eddc5baa2eb68a6f021f72625d2551b495a2)
…culations. Code responsible for internal capacitor values containted leftover workarounds in the calculations after PS update. Removed redundant conversions and cleaned up both code and comments to align both LFXO and HFXO calculation. Signed-off-by: Michał Stasiak <[email protected]> (cherry picked from commit 63f2fe9dd476eb24e90abc79650ab7b7247ad3a0)
Adopt to proper Path usage for nrf modules Updated for upmerge. nrf-squash! [nrf noup] ci: set `ZEPHYR_<MODULE_NAME>_KCONFIG` for NCS modules Signed-off-by: Carles Cufi <[email protected]> Signed-off-by: Torsten Rasmussen <[email protected]>
Remove CONFIG_PINCTRL. nrf-squash! [nrf noup] boards: nordic: nrf7002dk: Bring back NS variants Signed-off-by: Johann Fischer <[email protected]>
…t_config The nRF GPIO hardware does not store the initial output value set resulting from gpio_pin_configure() and thus, when gpio_get_config() is used, the initial value is not returned. This commit just reads the output value and sets the INIT value to match in gpio_get_config(). Signed-off-by: Bjarki Arge Andreasen <[email protected]> (cherry picked from commit 08269963370be2188a7c1898066f0fd6a3c8cbeb)
nRF7120 PDK support that uses IPC as comms b/w APP and Wi-Fi domains. Signed-off-by: Chaitanya Tata <[email protected]> (cherry picked from commit 3953bb9ce343586e3036821bb93d46954b42ea71)
Set static or random MAC before calling net_linkaddr_set(). Signed-off-by: Seppo Takalo <[email protected]> (cherry picked from commit 673853ae5a9b38c8d9f204ad1998b97a305020d8)
This reverts commit 5386a64. Issue is no longer relevant. Simplify use of board by restoring enabling secure ipc by default. Signed-off-by: Bjarki Arge Andreasen <[email protected]> (cherry picked from commit 89ba317a55d6a170807b1ee1d465929f1449ad61)
|
carlescufi
approved these changes
May 13, 2025
anangl
approved these changes
May 13, 2025
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#88816d8dae503c86e5b