Upmerge 2025.03.12 #2612
Open
Upmerge 2025.03.12 #2612
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_atmel
manifest-cmsis-nn
manifest-hal_infineon
manifest-cmsis
manifest-trusted-firmware-m
manifest-nrf_wifi
manifest-lvgl
manifest-hostap
manifest-mipi-sys-t
manifest-liblc3
manifest-hal_adi
manifest-hal_microchip
manifest-hal_nxp
manifest-uoscore-uedhoc
manifest-mcuboot
labels
This adds temporary entropy driver simulation for nRF54l09 device since final entropy source is not available yet. TODO: Remove this commit when proper solution will be available. Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no> (cherry picked from commit a68f065)
The SDC HCI controller is defined as a device tree node. A node representing the SDC controller is added and selected as the default over the open source link layer. This is consistent with other SoCs. Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no> (cherry picked from commit 7d700de)
Added ncs-specific modules to nrfx_config_reserved_resources. The modules are: - mpsl - nrfe Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no> (cherry picked from commit 3c9c7af)
As nrfx_config is included before MDK, MDK-specific device symbols cannot be used. Use Kconfig symbols instead. Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no> (cherry picked from commit cd49156)
nrf-squash! [nrf noup] soc: nrf54l: Add custom section for KMU The linker script inclusion which places the KMU reserved buffer on the top of RAM doesn't work for non-XIP builds. The Zephyr linker script will firstly load the code for an non-XIP build in RAM and then include this KMU related linker script which results in an unpredictable placement of the KMU reserved area and a failed build. In order to support non-XIP builds the linker file is not included and the a DTS reserved-memory entry should be used. To limit the scope, the DTS reserved memory region is currently only supported for non-XIP builds. This is a noup since the KMU is not supported upstream. Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no> (cherry picked from commit b91aa4f)
nrf-squash! [nrf noup] tests: drivers: mspi: api: Add nRF54L15 overlay file Fix device frequency for nRF54L15. SDP MSPI allows only a predefined set of device frequencies. Signed-off-by: Magdalena Pastula <magdalena.pastula@nordicsemi.no> (cherry picked from commit 7b4d2eb)
…targets. Mesh currently works with trusted storage on real targets. Until secure storage is supported by default disable it. Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no> (cherry picked from commit d445231)
Remove the closed loop mode implementation for the fll16m clock. Closed loop causes a hardware bug resulting in increased current consumption if SoC experiences high, but within spec, temperatures. Upstream PR #: 86339 Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no> (cherry picked from commit 7e1ff38)
…te fll16m Update the nrf clock control test suite to not attempt to set the removed closed loop mode of the fll16m clock. Upstream PR #: 86339 Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no> (cherry picked from commit aaad8ca)
…mote core When decoding logs from a remote core with memory that APP can access, wrong address of an array with string addresses was used. Log message contains index of a string and APP strings array was used instead of remote core. Extend STMESP logging so that address of string array of a remote core is send during startup to the APP and APP is using this array to decode strings from remote cores. Bug applies only to PPR and FLPR as APP has no access to RAD memory. Upstream PR #: 86242 Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no> (cherry picked from commit 6147494)
Add `IPC_SERVICE_BACKEND_ICBMSG_EP_BOUND_WORK_Q_STACK_SIZE` config and parametrize its value depending on the optimization level. Upstream PR #: 86103 Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no> (cherry picked from commit 769a573)
nrf-squash! [nrf noup] tests: drivers: mspi: api: Add nRF54L15 overlay file Fix the test for nRF54L15 after changing definition of external flash in DTS. Signed-off-by: Magdalena Pastula <magdalena.pastula@nordicsemi.no> (cherry picked from commit afc1b46)
When a LD sends an ic-msg to SCFW - it happens that sometimes that SCFW does not handle the request. For the moment the problem is solved by sending a second vevif event shortly after the initial request. Upstream PR #: 86455 Signed-off-by: Maciej Meijer <maciej.meijer@nordicsemi.no> (cherry picked from commit 3850f28)
…54 devices Extend spi_loopback test on nRF54 chip family. Add configurations to run this test at 8/16/32 MHz. Upstream PR #: 86010 Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
…Cracen driver on nRF54H20 A larger stack is needed to accomodate the Cracen driver. Signed-off-by: Gordon Klaus <gordon.klaus@nordicsemi.no> (cherry picked from commit b3d63c6)
nrf-squash! [nrf noup] include: net: add NCS extensions Removes leftover socket options `TLS_SESSION_CACHE_DISABLED` and `TLS_SESSION_CACHE_ENABLED`. These exist already in `socket.h`. Signed-off-by: Mirko Covizzi <mirko.covizzi@nordicsemi.no> (cherry picked from commit 93f72ad)
nrf-squash! [nrf noup] include: net: add NCS extensions Adds a base value for NCS specific socket options to prevent overlaps with Zephyr's socket options. Signed-off-by: Mirko Covizzi <mirko.covizzi@nordicsemi.no> (cherry picked from commit 10eb60b)
…ting When left-shifting '1' by 31, the result is undefined. This is something ASAN detects. Solve this by explicitly defining that the integer is unsigned. Upstream PR #: 86624 Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no> (cherry picked from commit bda111b)
Quad Enable bit is used to enable/disable 4x line IO in SPI. Upstream PR #: 85520 Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no> (cherry picked from commit a7e820a)
nrf-squash! [nrf noup] tests: drivers: mspi: api: Add nRF54L15 overlay file Custom overlay is now in `nrf/tests/zephyr/...` Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no> (cherry picked from commit 4995572)
String location information should only be sent for core which do not append strings to the log message (PPR, FLPR). Without this, cpurad was also sending that information and that was redundant. Upstream PR #: 86242 Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no> (cherry picked from commit 5715c89)
This adds temporary entropy driver simulation for nRF54h20 device since final entropy source is not available yet. TODO: Remove this commit when proper solution will be available. Jira: NCSDK-25947 Signed-off-by: Kamil Gawor <Kamil.Gawor@nordicsemi.no> Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no> Signed-off-by: Andreas Moltumyr <andreas.moltumyr@nordicsemi.no> Signed-off-by: Karol Lasończyk <karol.lasonczyk@nordicsemi.no> (cherry picked from commit 0d8345e) (cherry picked from commit ac886cc) (cherry picked from commit 45a4bc3)
…_QUAD_1_4_4 Extend driver to support single lane and 1-4-4 IO modes. Upstream PR #: 85520 Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no> (cherry picked from commit dd02c86)
This commit brings back modifications from these reverted commits: - f68b2ed - e606246 slightly adjusted so that the EXMIF peripheral is still by default handled by the mspi_dw driver, and in cases where this driver cannot be used because something still does not work correctly, one can switch to the old solution based on the tweaked spi_dw driver. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no> (cherry picked from commit a17094e)
nrf-squash! [nrf noup] sample/smp_svr: nrf54l15dk test cases nrf-squash! [nrf noup] samples/**/smp_svr: testcase of nrf54l15pdk with ext-flash DT Add proper configs to sample.yaml. Ref: NCSDK-31608 Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no> (cherry picked from commit 4c92a51)
nrf-squash! [nrf noup] include: net: add NCS extensions Reduces the NCS_BASE to a lower number to simplify those use cases where certain applications would let the user input the socket option name by number. The base is still high enough to prevent collisions with Zephyr's own socket options for many years. Signed-off-by: Mirko Covizzi <mirko.covizzi@nordicsemi.no> (cherry picked from commit 3d1d0af)
…x 3.11 To be reverted or overwritten once full renamig of nRF54L09 and nRF54L20 comes into NCS. Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no> (cherry picked from commit fe6447b)
Upstream not ready yet, revert once applied there. Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com> Signed-off-by: Karsten Koenig <karsten.koenig@nordicsemi.no> (cherry picked from commit 6ec9d10)
tmon-nordic
force-pushed
the
meta-upmerge
branch
from
ff0d149 to
29d04be
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.
Currently just to preview how many things break. Upstream PRs 79355, 85310 need to have conflicts resolved (dropped for the time being).