Upmerge 02.06.2025 #2926
Merged
Upmerge 02.06.2025 #2926
+183,305
−63,501
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
This was referenced Jun 2, 2025
github-actions
bot
added
manifest
manifest-hal_adi
manifest-hal_microchip
manifest-hal_wch
manifest-hal_ti
manifest-hal_renesas
manifest-hal_ambiq
manifest-zscilib
manifest-babblesim_ext_2G4_phy_v1
manifest-trusted-firmware-m
manifest-nrf_wifi
manifest-hal_silabs
manifest-babblesim_base
labels
rlubos
force-pushed
the
meta-upmerge
branch
2 times, most recently
from
e801d9b to
83279c9
Compare
…ation CONF_FILE parameter in testcase.yaml overwrites board specific configurations. Change it to EXTRA_CONF_FILE to apply both configurations. Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no> (cherry picked from commit 72623f9)
… 3.12.0 New nrfx release contains MDK 8.71.1 and various fixes for nRF devices. Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no> (cherry picked from commit f46798f)
…ration Some nRF devices allow to configure burst setting per channel while others globally. Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no> (cherry picked from commit 5abf43c)
Some nRF devices do not allow to configure gain. Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no> (cherry picked from commit 647477c)
ZMS legacy enabled by CONFIG_SETTINGS_ZMS_LEGACY uses a different lookup cache function that is optimized for Settings subsystem. Signed-off-by: Riadh Ghaddab <rghaddab@baylibre.com> (cherry picked from commit d07064e)
… 3.12.1 New nrfx release contains fixes for SPIM and GRTC driver. Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no> (cherry picked from commit 59334fa41efa452995989fd46895fd35b27d411f)
Allow to add an image-specific DTS overlay, that is applied based on the FILE_SUFFIX. Up to this point, it was possible to specify such Kconfig files (sysbuild/<image>_<file_suffix>.conf), but it did not work with dts overlays (sysbuild/<image>_<file_suffix>.overlay). This commit aligns the logic of finding configuration files for both scenarios mentioned above. Ref: NCSDK-NONE Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no> (cherry picked from commit 13a0f05)
Allow more TWIS instances to be tested. Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no> (cherry picked from commit f9be8753f5187bef7d9c2c84428b4ef13d3e1499)
For GRTC timer a longer timeout is required: (2 ^ 32) * 2 * 1us Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no> (cherry picked from commit d0785ce)
The HFXO used on nRF54L15 DK has the typical startup latency of 854us. Upstream PR #: 90795 Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no> (cherry picked from commit 39076d5)
…ency The clock startup latency is now obtained from the clock driver and the nrf-802154 is now set to a value that matches hardware capabilities. Upstream PR #: 90795 Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no> (cherry picked from commit 4b3f171)
Extended analog pins mappings for more nRF54L targets. Upstream PR #: 91581 Signed-off-by: Michał Stasiak <michal.stasiak@nordicsemi.no> (cherry picked from commit bd990c5)
…calls to it This is a follow-up to commit a068709. As the SPIM_REQUESTS_CLOCK() macro changed the type of its parameter, all of the calls to it need to be updated accordingly. Also the call to DT_NODELABEL() needs to be removed from that macro as DT_CLOCKS_CTLR() already returns a node identifier. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no> (cherry picked from commit ec06e63)
…STS is disabled If `CONFIG_SYS_CLOCK_EXISTS=n`, then `CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC` will likely not be defined at all. Fix the compilation by moving the check for it being `== 0` to a separate preprocessor #if statement. Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no> (cherry picked from commit 03f46db)
… fwid length Commit sets max possible number of tx and rx segments to not adapt them anymore. Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no> (cherry picked from commit a046f25)
Commit changes BT_MESH_DFU_FWID_MAXLEN option to be compliant with BLE Mesh specification. Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no> (cherry picked from commit 2411238)
…rious empty macro If SYS_CLOCK_EXISTS is not enabled, then the SYS_CLOCK_HW_CYCLES_PER_SEC still gets created, but with no value. This causes the code generation in misc/generated/CMakeLists.txt to create an empty assembly macro: `.equ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC,` which then causes a build error. Disable SYS_CLOCK_HW_CYCLES_PER_SEC entirely when SYS_CLOCK_EXISTS is disabled to fix this. This is a follow-up to 03f46db. Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no> (cherry picked from commit 61cdcb3)
The help message for the wifi mode -s command indicates it sets the Wi-Fi mode to station. However, the Zephyr Wi-Fi shell subsystem was incorrectly using a get operation instead of set. This commit corrects the behavior to properly set the Wi-Fi mode, aligning the implementation with the help message. Signed-off-by: Arunmani Alagarsamy <arunmani.a@silabs.com> (cherry picked from commit 0faba15)
Include nordic,nrf-nfct-v2 compatible in the option. Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no> (cherry picked from commit 2d82970710d1f8da131b9f10d77bc0c60e544cca)
Use nordic,nrf-nfct-v2 compatible in the main nrf54h20 devicetree description. Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no> (cherry picked from commit b84dd5b600e0749f7fdcaa372dd05b22944f1916)
… cpurad NFCT is by default assigned to application so DT node does not need to be enabled or reserved in DT to have access to NFCT registers. On cpurad NFCT must be reserved to enable register access and then antenna pins can be configured as gpios. Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no> (cherry picked from commit 1dc42fc22709ed1d1bf5d5ea0f0c5b2c59ac2d5a)
Add information about nfct node status. For cpuapp status is irrelevant because NFCT is by default assigned to cpuapp but for cpurad node needs to have reserved status. Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no> (cherry picked from commit 9caab5b23f3cd34d318cb3ea13c187ef75364325)
Add a new "if_name" pointer to the transport configuration structure, allowing the application to bind MQTT client to a specific network interface. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no> (cherry picked from commit 35af68b840d7778afbe7e0566ab45d1c0c511937)
…oad at runtime Add new socket offloading functions, allowing to enable/disable offloaded DNS implementation at runtime. This may be useful if there is a mix of offloaded/native network interfaces in the system, so the application can choose which DNS backend to use. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no> (cherry picked from commit b18bc7cc3e484e8988142a5986d4fc712a326859)
…g stats net_stats_t type is an unsigned type, therefore %u should be used instead of %d when printing values of this type, otherwise negative values will be printer if INT32_MAX is exceeded. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no> (cherry picked from commit b877d2c1fe4649aaee3432ca6a0844aab9495d51)
In high throughput tests it's fairly easy to overflow the current 32-bit byte counters in net statistics (it's just over 4 GB of data). Therefore, make the byte counters 64-bit to prevent overflows. Rearrange some fields to avoid padding. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no> (cherry picked from commit 86244a9c543aed48e5305174c7dd42cb89456009)
|
jfischer-no
approved these changes
Jun 16, 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.
Conflicting noups at the moment of creating the PR, please verify if conflicts were resolved correctly:
nrf noup] test: schedule_api: Use Minimal C library[nrf noup] samples: net: wifi: Update certificates[nrf noup] tests: bluetooth: tester: sysbuild configurable 53/54H[nrf noup] entropy: Add fake entropy nRF PRNG driver[nrf noup] boards: nordic: nrf7002dk: Bring back NS variants, DOMAIN_CPUAPP_BOARD removed upstream[nrf noup] tests: bluetooth: tester: Increment peripheral count value, dropped, file removed upstream