Upmerge 02.06.2025 #2926
Open
Upmerge 02.06.2025 #2926
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
This test cannot be executed with the SDFW Service Framework client started, so disable its initialization. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no> (cherry picked from commit 4b18963)
The BT_DRIVERS symbol default value 'y' used to depend on !BT_CTLR but now it is always on when BT is set. For BT_RPC the BT_DRIVERS symbol must not be enabled on the client side as no driver is used. The temporary solution is to set BT_DRIVERS to 'y' by default only when BT_HCI stack selection is enabled. It will be 'n' when BT_RPC_STACK is enabled. The fix should be fine as NCS uses either HCI or RPC stack. Signed-off-by: Michał Grochala <michal.grochala@nordicsemi.no> (cherry picked from commit 6e8c8c7)
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 <tomi.fontanilles@nordicsemi.no> (cherry picked from commit 83f2792)
-Adding imply MBEDTLS_CIPHER_AES_ENABLED if not TF-M build in BT_CRYPTO -Needed to set a specific symbol for MBEDTLS + MBEDTLS_BUILTIN to work on network core build. -This [nrf noup] can be removed once PSA crypto is fully supported in network core, or PSA crypto is not compiled in at all and is provided as a RPC-mechanism via the app-core Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no> (cherry picked from commit f0c7062)
…mple Adds a configuration to this sample that is optimised for testing/usage with the nRF5340 which enables the Bluetooth transport, enables most management groups, has a static partition manager file with secondary partitions on QSPI flash, configures MCUboot in overwrite only mode with network core update support Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit 728c9f7)
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 238340a)
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 2114de9)
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 fc5978f)
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 d1c8f9a)
…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 d6e3bbd)
…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 7e686e8)
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 be53bed)
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 c3c1692)
Configure SDP MSPI pins to switch their control to VPR core Signed-off-by: Jakub Zymelka <jakub.zymelka@nordicsemi.no> Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no> Signed-off-by: Magdalena Pastula <magdalena.pastula@nordicsemi.no> (cherry picked from commit c55bfc3)
Update Kconfig options for qualification: - Remove experimental on qualified feature. - Add experimental on unqualified feature. - BT_L2CAP_ECRED is not marked as experimental upstream and we qualify it downstream. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no> Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no> Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no> Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no> Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no> Signed-off-by: Ingar Kulbrandstad <ingar.kulbrandstad@nordicsemi.no> Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no> Signed-off-by: Herman Berget <herman.berget@nordicsemi.no> Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no> Signed-off-by: Théo Battrel <theo.battrel@nordicsemi.no> (cherry picked from commit 6f4fda4)
noup since this option does not exist upstream. The Oberon PSA core has an option to manually set the buffer size of the PSA key slots in bytes. This option here: MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE This option has a default value of 16 since it directly affects the memory usage. The crypto tests use a secp256r1 key and thus since the public key for this key is 65 bytes long we need to set the option in the sample. Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no> (cherry picked from commit 615f804)
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 <andrzej.glabek@nordicsemi.no> Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no> (cherry picked from commit 06171de)
Fixes an issue whereby just enabling hooks would enable the nrf5340 network core hook despite lacking other requirements Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit 497a6fa)
Use PPI resources information from SoftDevice when it is present. Co-authored-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no> Signed-off-by: Eivind Jølsgard <eivind.jolsgard@nordicsemi.no> (cherry picked from commit 9b21d44)
The PSA is a cryptographically secure random number generator. It will be enabled by default, eventually, For now, enable it manually. Signed-off-by: Gordon Klaus <gordon.klaus@nordicsemi.no> (cherry picked from commit ea9188b)
Initial implementation of nRF54L quirks necessary for nRF54LM20A. To be upstreamed after TODO comments are resolved. Signed-off-by: Tomasz Moń <tomasz.mon@nordicsemi.no> (cherry picked from commit f35ea13)
Necessary changes for NCS CI. - Add a Jenkinsfile - Add a commit-tags workflow: This enables sauce tag checking in sdk-zephyr - compliance.yml: Disable check for merge commits, since we have upmerges downstream. Also, since in the code we refer to Kconfig symbols that are defined in the sdk-nrf repository, the Kconfig checks ((SysBuild)Kconfig, (SysBuild)KconfigBasic and (SysBuild)KconfigBasicNoModules) will not pass so exclude them. Also, disable any maintainers-related checks - scripts/gitlint: Extend the max commit line lengths for Gitlint to account for sauce tags - Adapt to the changes in: nrfconnect/action-commit-tags#4 Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no> Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no> Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no> Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no> Signed-off-by: Krishna T <krishna.t@nordicsemi.no> Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no> (cherry picked from commit 0648e72)
Adds symbols used in NCS to the sysbuild Kconfig allow list Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no> (cherry picked from commit 37bd53a)
This default matches the default before it got changed in nrfconnect/sdk-nrf#22369. This ensures that the current consumption when using Bluetooth remains unchanged. The default of 854 is slightly smaller than what is recommended by the documentation provided for MPSL_HFCLK_LATENCY. It is still likely good enough for this board and its use cases. This noup commit can be replaced once: * HFXO startup latency is defined in device tree: zephyrproject-rtos/zephyr#90615 * The startup latency is configured per board and not per SoC. The startup latency is board specific as the HFXO is an SOC-external component. Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no> (cherry picked from commit be025e3)
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 Upstream PR #: 90643 Signed-off-by: Tomasz Chyrowicz <tomasz.chyrowicz@nordicsemi.no> (cherry picked from commit ef44738)
…in dBm The nrf-802154 component of hal_nordic is updated. The CCA threshold configuration is now done in dBm units, instead of hardware-dependent scale. Fixed a bug, where the CONFIG_NRF_802154_CCA_ED_THRESHOLD units were different from the NRF_802154_CCA_ED_THRESHOLD units. Now all configuration is done in dBm. Upstream PR #: 90795 Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no> (cherry picked from commit ba8fd23)
nrf-squash! [nrf noup] modules: hal_nordic: adjust nrfx reservations to NCS nrf-squash! [nrf noup] modules: hal_nordic: use Kconfig symbols in NCS reservation nrf-squash! [nrf noup] modules: hal_nordic: nrfx: Add SoftDevice PPI resources Add peripherals used by MPSL and SDC on nRF71-series matching nRF54L. Signed-off-by: Aleksandar Stanoev <aleksandar.stanoev@nordicsemi.no> (cherry picked from commit 666ecc8)
|
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