Upmerge 08.08.2025 #3178
Open
Upmerge 08.08.2025 #3178
+278,104
−64,151
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
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 e606b2a)
Non-secure variants for nRF7002 DK were removed from upstream in commit 10d4973. Revert these changes downstream, so that the NS variants are still available. Signed-off-by: Andrzej Głąbek <[email protected]> Signed-off-by: Johann Fischer <[email protected]> (cherry picked from commit c1643fa)
This patch backports the nrf9131ek to a time before tfm was refactored. To be reverted when TF-M is updated. Signed-off-by: Maximilian Deubel <[email protected]> (cherry picked from commit 797a60e)
Add support for nRF54lm20a to the hci_uart sample. Signed-off-by: Gordon Klaus <[email protected]> (cherry picked from commit 1512388)
Allow to use CONFIG_BT_ID_AUTO_SWAP_MATCHING_BONDS Kconfig option even if CONFIG_BT_PRIVACY is disabled. This is because CONFIG_BT_PRIVACY configures privacy of local device will still allows to resolve peer address. During pairing, peer device may send its Identity Address and IRK which then can be used for address resolution. This doesn't require CONFIG_BT_PRIVACY be enabled. nrf-squash! [nrf noup] bluetooth: host: Add support for bonding with same peer Signed-off-by: Pavel Vasilyev <[email protected]> (cherry picked from commit c1ddd14)
Adds support for outputting details on sysbuild Kconfigs for use with the documentation Kconfig lookup tool Upstream PR #: 93861 Signed-off-by: Jamie McCrae <[email protected]> (cherry picked from commit 6fb16ab)
- Fixed pin configuration for nRF54L15 (QDECs can use only port 1) - Changed the way the test handles testing multiple instances to make it possible to output quadrature signal to one QDEC instance at a time. Upstream PR #: 93927 Signed-off-by: Michał Bainczyk <[email protected]> (cherry picked from commit e6948df)
Increased stack sizes for mesh provisoner sample. Values are based of thread analysis, plus added margin. Signed-off-by: Stine Åkredalen <[email protected]> (cherry picked from commit 8876f35)
…uicr.py Upstream PR #: 94064 Set the VERSION field to 2.0 in gen_uicr.py to indicate the version of the format the script produces blobs for. This is required for forwards compatibility with newer versions of IronSide SE. Signed-off-by: Jonathan Nilsen <[email protected]> (cherry picked from commit 7d913ca)
… dependencies Update Kconfig dependencies in mbedTLS and logging backend to use OPENTHREAD instead of NET_L2_OPENTHREAD. Upstream PR #: 94054 Signed-off-by: Łukasz Duda <[email protected]> (cherry picked from commit f39f764)
… default External flash memory is typically not used, so it should be disabled by default. The GPIO6 port used by this device should also be disabled. Upstream PR #: 94180 Signed-off-by: Adam Kondraciuk <[email protected]> (cherry picked from commit 63febf7)
…PR core PPR was using 1 kHz system clock frequency instead of default 31250 Hz used on other cores with GRTC. Low frequency impacts system clock accuracy. There is no reason to use different frequency for PPR. Upstream PR #: 94112 Signed-off-by: Krzysztof Chruściński <[email protected]> (cherry picked from commit e78ab1d)
…al sampling timer The SAMPLERATE register can be used as a local timer instead of triggering individual SAMPLE tasks. When SAMPLERATE.MODE is set to Timers, it is sufficient to trigger SAMPLE task only once in order to start the SAADC and triggering the STOP task will stop sampling. The SAMPLERATE.CC field controls the sample rate. The SAMPLERATE timer should not be combined with SCAN mode and only one channel should be enabled when using the internal timer. Upstream PR #: 91368 Signed-off-by: Jakub Zymelka <[email protected]> (cherry picked from commit 77547f8)
…ended ADC readings The ADC driver API already supports ADC readings which can return signed values, these are differential readings. In Nordic's datasheet, we have a mode called "single ended", but its just a name. "Single ended" is a differential reading, with the negative channel tied to GND. This is not compatible with zephyrs definition of a single ended reading. To support Nordic's "single ended" mode, the user must configure a differential reading, with the negative input tied to ground, which the saadc driver can then use to configure the reading as Nordic SAADC "single ended", and return negative values as expected. Upstream PR #: 94069 Signed-off-by: Jakub Zymelka <[email protected]> (cherry picked from commit 84ab620)
This typo was fixed in upstream but not ported to NCS This creates conflicts when cherry picking. Signed-off-by: Łukasz Stępnicki <[email protected]> (cherry picked from commit ec8bfd8)
…I isr Both the nrf_802154_clock_hfclk_start() and nrf_802154_clock_hfclk_stop() can potentially be called form ZLI and non-ZLI contexts and consecutive calls are not guaranteed to be alternating. Added an implementation that uses the EGU to de-escalate to a non-ZLI context from which it is safe to use the Zephyr API that enables/disables the HFXO. Upstream PR #: 94208 Signed-off-by: Rafał Kuźnia <[email protected]> (cherry picked from commit 568a8ad)
Make the storage UID type 32-bit long. This makes it more convenient to use those UIDs as storage entry IDs when storing the entries to NVM. The previous 64+ bits UIDs made it incovenient to use them as such. As Zephyr defines UID ranges to be used (see e.g. `zephyr/psa/key_ids.h`), this guarantees that all the UIDs will fit within the 30 bits reserved for them. The secure storage ITS implementation API is changed to take `psa_storage_uid_t` separately so the implementation can check that no forbidden bits are set before they are packed into `secure_storage_its_uid_t`. This change breaks backward compatibility because `secure_storage_its_uid_t`, which is used both as part of the additional data for authentication and for generating encryption keys, changes size from 12 to 4 bytes. For users wanting to preserve backward compatibility (for example when upgrading an existing installation to a newer Zephyr release) or that for some reason want to use a 64-bit `psa_storage_uid_t`, the Kconfig option CONFIG_SECURE_STORAGE_64_BIT_UID is added. When enabled, it makes the implementation behave the same as previously and compatibility with existing entries is preserved. This was tested manually. Fixes zephyrproject-rtos/zephyr#86177. Signed-off-by: Tomi Fontanilles <[email protected]> Upstream PR #: 94171 (cherry picked from commit c784ed1)
Cast the UIDs to unsigned long when they are 32 bits. This allows to use a single %l length modifier instead of the double one for long long. Certain printf implementations only support the former and not the latter length modifier, so this has the advantage to work with them now that the UIDs are 32-bit by default. Signed-off-by: Tomi Fontanilles <[email protected]> Upstream PR #: 94171 (cherry picked from commit 2ce0698)
…r 64-bit UIDs Add test scenarios for the newly-added CONFIG_SECURE_STORAGE_64_BIT_UID enabled with both the ZMS and Settings backends. They don't test backward compatibility but it makes sure that secure storage compiles and works fine with this configuration. Signed-off-by: Tomi Fontanilles <[email protected]> Upstream PR #: 94171 (cherry picked from commit 5f0e7cd)
noup because it's about partition manager. Fix the build of secure_storage.psa.its.secure_storage.store.zms on nrf54l15dk/nrf54l15/cpuapp by disabling partition manager, which is incompatible with the ZMS implementation of the ITS store module. Disabling it only for that test as it's not needed for the others and even makes the NS board targets fail if disabling PM. Signed-off-by: Tomi Fontanilles <[email protected]> (cherry picked from commit eb02a02)
77f19eb made ZMS depend on FLASH_MAP. Enable that Kconfig option in the ZMS Kconfig overlay file. Signed-off-by: Tomi Fontanilles <[email protected]> Upstream PR #: 94171 (cherry picked from commit 2f40e49)
nrf54l15dk/nrf54l15/cpuapp already covers the non-emulated case as part of the integration_platforms. Having ophelia4ev/nrf54l15/cpuapp does not bring any additional value and increases CI load, so remove it. Signed-off-by: Tomi Fontanilles <[email protected]> Upstream PR #: 94171 (cherry picked from commit f9e3cfe)
Explicitly specify native_sim as integration platform for better PR CI coverage. Signed-off-by: Tomi Fontanilles <[email protected]> Upstream PR #: 94171 (cherry picked from commit 5161a6a)
Instead of literally having 0x in the format string, use the %# flag character so the printf implementation adds the 0x for us. Signed-off-by: Tomi Fontanilles <[email protected]> Upstream PR #: 94171 (cherry picked from commit fdb9ab5)
Add a bullet point for this new, relatively important deviation from the official specification. Also, advertise the Zephyr-specific zephyr/psa/* header files as they are related and probably need more attention from end users. Signed-off-by: Tomi Fontanilles <[email protected]> Upstream PR #: 94171 (cherry picked from commit 804a1d5)
The default TFM profile type Minimal in NCS doesn't have all algorithms needed by this test. Signed-off-by: Pavel Vasilyev <[email protected]> (cherry picked from commit 319b359)
…-mode We need to check value of the sample not the pointer. Upstream PR #: 91368 Signed-off-by: Jakub Zymelka <[email protected]> (cherry picked from commit e54b994)
…umption This is temporary fix for SAADC power consumption. Need to be removed after hal_nrfx version upgrade. Upstream PR #: 94383 Signed-off-by: Jakub Zymelka <[email protected]> (cherry picked from commit 2158e6b)
Added additional cleanups between tests, which fixed the issue of a failing testcase on nRF54L15. Upstream PR #: 93927 Signed-off-by: Michał Bainczyk <[email protected]> (cherry picked from commit d24c26f)
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.
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