Upmerge 08.08.2025 #3178
Merged
Upmerge 08.08.2025 #3178
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
github-actions
bot
added
manifest
manifest-hal_microchip
manifest-hal_rpi_pico
manifest-net-tools
manifest-hal_nxp
manifest-hal_ambiq
manifest-hal_stm32
manifest-hal_ti
manifest-cmsis
manifest-hal_infineon
manifest-trusted-firmware-m
manifest-fatfs
manifest-tinycrypt
manifest-libmetal
manifest-nrf_hw_models
manifest-zephyr-lang-rust
manifest-tf-m-tests
manifest-lvgl
manifest-mcuboot
manifest-sof
manifest-hal_silabs
manifest-mbedtls
manifest-hal_renesas
manifest-open-amp
manifest-cmsis_6
manifest-hal_adi
manifest-hal_espressif
DNM (manifest)
labels
This patch should be dropped as part of the next upmerge. The upcoming release of IronSide SE no longer disables RETAIN in all GPIO instances on boot, so the application must be able to handle the hardware default state of RETAIN being enabled. The GPIO retention is properly handled by changes that are currently only upstream and will be pulled in by the next upmerge. This patch exists a workaround to be able to integrate IronSide SE before the proper solution is pulled in. Signed-off-by: Jonathan Nilsen <[email protected]> (cherry picked from commit 20d89eb)
Allows listing sysbuild Kconfigs for SoCs Signed-off-by: Jamie McCrae <[email protected]> (cherry picked from commit 1d73d0e)
Fixup to the TF-M 2.2.0 update. Signed-off-by: Tomi Fontanilles <[email protected]> Upstream PR #: 94729 Signed-off-by: Tomi Fontanilles <[email protected]> (cherry picked from commit b48a1f2)
This is needed for any Kconfig processing Upstream PR #: 95771 Signed-off-by: Jamie McCrae <[email protected]> (cherry picked from commit 2fc387e)
Loads this file in a better way that means samples and modules should not have to source the file before referencing Kconfig module path variables Upstream PR #: 95771 Signed-off-by: Jamie McCrae <[email protected]> (cherry picked from commit 25ced41)
Previously reopening of PR did not reopen manifest PR. This commit will enable reopening of manifest PR in such case. Signed-off-by: Kari Hamalainen <[email protected]> (cherry picked from commit 96ef102)
Add stress test that randomly starts and aborts multiple timers from various contexts. Test checks if timers do not expire prematurely. Upstream PR #: 87944 Signed-off-by: Krzysztof Chruściński <[email protected]> (cherry picked from commit 0af05cc)
…ge dump If test is to be run in coverage mode, wait for output to dump at the end of a failing testcase. Upstream PR #: 95162 Signed-off-by: Michał Stasiak <[email protected]> (cherry picked from commit 5408ed3)
…plementation Add Kconfig entries to allow compile own s2ram implementation. Signed-off-by: Karol Lasończyk <[email protected]> Signed-off-by: Andrzej Puzdrowski <[email protected]> (cherry picked from commit e6e402f)
…art instances The uart driver for nRF54h20 doesn't call pm_device_runtime_enable(). During an uart driver init `pm_device_driver_init()` return early, because the `pm_device_is_powered()` returns `false`. Power domains, where uarts are instantiated, are disabled: `pm->domain->pm_base->state` is not equal to `PM_DEVICE_STATE_ACTIVE`. At the end of the day, an uart instance is left disabled. This is a workaround to make the uart usable when CONFIG_PM, CONFIG_PM_DEVICE and CONFIG_PM_DEVICE_RUNTIME are enabled. Signed-off-by: Piotr Pryga <[email protected]> (cherry picked from commit eaede77)
Set PSA as the entropy source for nRF54lm20a target. PSA is the only NCS-supported interface to CRACEN. There is no other entropy source in 54lm20a than CRACEN. The commit also disables `rng` compatible with `nrf-cracen-ctrdrbg`, the nrfx based interface to CRACEN that is used in upstream Zephyr. Only one CRACEN interface may be enabled. Signed-off-by: Piotr Pryga <[email protected]> (cherry picked from commit ffdab1b)
…8.72.3 New hal_nordic revision contains MDK 8.72.3 with changes for nRF54LV10A EngA SoC. Upstream PR #: 95907 Signed-off-by: Michał Stasiak <[email protected]> (cherry picked from commit 7d3bd39)
This alignment cannot be done through nrf fromlist commit, since it was introduced in the tree-wide commit: 2d22884 Once tried to pull all changes to merge it cleanly, the chain ended up in the doc/releases/migration-guide-4.3.rst file, which would bring nearly all of the changes from the Zephyr 4.3 release, making a small PR with just 4 white characters a Zephyr upmerge PR. Feel free to drop this commit during the next Zephyr upmerge. Signed-off-by: Tomasz Chyrowicz <[email protected]> (cherry picked from commit 998ed1b)
If the area, dedicated for the interrupt stack is not available, allow to specify a memory region that will be used as the stack for the S2RAM resume logic. Upstream PR #: 95914 Signed-off-by: Tomasz Chyrowicz <[email protected]> (cherry picked from commit c9cfa62)
Add the definition of pm_s2ram_stack memory region for nRF54H20. Upstream PR #: 95914 Signed-off-by: Tomasz Chyrowicz <[email protected]> (cherry picked from commit c274834)
Added support for hardening decision on resume from S2RAM by MCUboot bootloader. Application sets additional variable to MCUBOOT_S2RAM_RESUME_MAGIC which allows the bootloader to doublecheck. Signed-off-by: Andrzej Puzdrowski <[email protected]> (cherry picked from commit d4bb1c6)
Adjusting the max shortest ticks value for slow PPR core. Signed-off-by: Paweł Pelikan <[email protected]> (cherry picked from commit 1192dbf)
The SoftDevice Controller is a different controller than the open source link layer with a different set of quirks. The SoftDevice Controller is a default BT controller in nRF Connect SDK context, therefore it should be enabled by default instead of open source link layer. The commit changes the default BT controller for nRF54lm20a SoC. Signed-off-by: Piotr Pryga <[email protected]>
Disable the KMU by default for all the NRF54L devices for this test. With the current configuration this test is incompatible with the KMU because it changes the placement of the RAM in the linker files and this collides with the KMU logic. But it also does not need the KMU so there is no need to be there. This is a noup because the configuration (and KMU support) is only placed in ncs. The KMU dependency to reserve the top RAM address is planned to be done in dts (NCSDK-31980). Hopefuly when this is done this noup can be removed. Signed-off-by: Georgios Vasilakis <[email protected]>
The definitions of slot partitions and sram partition has been moved. Include corresponding headers. Signed-off-by: Ravi Dondaputi <[email protected]>
Upstream PR #: 94392 The power domains on the nrf54h20dk require NRFS, which uses some of the irq vectors reserved for the test. Disable power domains and its drivers to free the irq vectors. Signed-off-by: Bjarki Arge Andreasen <[email protected]>
When building with high optimization level, the compiler thinks duration may be used initialized and warns as much. Let's initialize this variable always to ensure it does not happen and with it pacify the compiler. Signed-off-by: Alberto Escolar Piedras <[email protected]> (cherry picked from commit 1d6da40)
The websocket used mbedtls functions to calculate the SHA1 needed. Update the code to use PSA crypto calls instead when the configuration CONFIG_MBEDTLS_PSA_CRYPTO_CLIENT is enabled. This can be useful for applications which use TF-M since it only provides PSA crypto APIs. Also check the error code from the mbedtls_sha1 call since it can fail and it was not checked before. Signed-off-by: Georgios Vasilakis <[email protected]> (cherry picked from commit 53b2802)
Although not reproducible locally, it has been observed in CI that the uicr image will not always be the last image to be run. To ensure it is the last image to be run we have it depend on the 'image' image when defined. The uicr image is generated based on all other images in the build and must therefore run last. Signed-off-by: Sebastian Bøe <[email protected]> (cherry picked from commit 32c6776)
Fixes drv_data structure handling in various configuration. Signed-off-by: Karol Lasończyk <[email protected]> (cherry picked from commit afff286)
… on devicetree Upstream PR #: 95915 Add build system support for populating the PERIPHCONF (global domain peripheral configuration), based on nodes and properties found in the devicetree. This should make it so all samples and tests that were broken by the move to IronSide SE now function correctly without workarounds or manual steps. When enabled, a new python script called gen_periphconf_entries.py is run when building. The script iterates over nodes and properties in the devicetree and generates a C file called periphconf_entries_generated.c in the build directory, which is added as a source file. The C file uses the macros from uicr.h to configure the global domain according to the devicetree. The PERIPHCONF entry generation is enabled by default when building for nrf54h20dk/nrf54h20/cpuapp and nrf54h20dk/nrf54h20/cpurad. It will also be used on nrf9280 soon, therefore it is placed in the common uicr directory. This new feature does the same job as nrf-regtool did when building for nrf54h20 before, and is compatible by the bindings that were used by nrf-regtool. Signed-off-by: Jonathan Nilsen <[email protected]>
…ut sysbuild Upstream PR #: 95915 Because generation and programming of UICR + PERIPHCONF artifacts depend on the 'uicr' image which in turn must be included by Sysbuild, many if not most nrf54h20 applications will need to be built using Sysbuild to function as intended. To make this known to the user, print a CMake warning whenever CONFIG_NRF_PERIPHCONF_SECTION=y but Sysbuild is not being used. Signed-off-by: Jonathan Nilsen <[email protected]>
jukkar
force-pushed
the
meta-upmerge
branch
from
d913aed to
d792280
Compare
nordicjm
approved these changes
Sep 23, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
62 participants
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.
Conflicting commits at the moment of creating the PR, please verify if conflicts were resolved correctly:
7728962 - [nrf fromlist] drivers: timer: nrf_grtc_timer: Optimize to reduce register access
2e2beca - [nrf noup] mcuboot: Add CONFIG_MCUBOOT_BOOTLOADER_USES_SHA512
6bbe5d6 - [nrf fromlist] tests: drivers: timer: nrf_grtc_timer: Add stress test
579af88 - [nrf fromlist] drivers: gpio: nrfx: Add support for GPIOTE0 on cpurad
9f730b0 - [nrf fromlist] drivers: spi: nrfx_spim: use dmm
b24d510 - [nrf noup] dfu/boot/mcuboot: fix confirmation in case of USE_PARTITION_MANAGER
6f17dc3 - [nrf noup] dts: Add Bluetooth Controller to nRF54H20
6d216e1 - [nrf noup] dts: Select SoftDevice Controller DTS binding as default
1449016 - [nrf noup] tests: arm_irq_vector_table: Disable starting of SSF client
a0d1032 - [nrf noup] entropy: Add fake entropy nRF PRNG driver
e40f531 - [nrf noup] dts: Select SoftDevice Controller on nRF54L09
e2aa08c - [nrf noup] entropy: Add fake entropy nRF PRNG driver
2e74ea7 - [nrf noup] drivers: pinctrl: Add SDP MSPI pin configuration
1512388 - [nrf noup] samples: bluetooth: Add support for nRF54lm20a to hci_uart