Repository navigation
Upmerge to SDK 1.6 - #730
Merged
ArekBalysNordic merged 2079 commits intoJul 29, 2026
Merged
Conversation
Bumps [third_party/pigweed/repo](https://github.com/google/pigweed) from `b9b6730` to `c9687b5`. - [Commits](pigweed-project/pigweed@b9b6730...c9687b5) --- updated-dependencies: - dependency-name: third_party/pigweed/repo dependency-version: c9687b52fa704606d19952255c78142fdb2a131a dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.6.2 to 7.0.1. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@ea165f8...043fb46) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: 7.0.1 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [third_party/ot-br-posix/repo](https://github.com/openthread/ot-br-posix) from `eb468e9` to `032aa85`. - [Release notes](https://github.com/openthread/ot-br-posix/releases) - [Commits](openthread/ot-br-posix@eb468e9...032aa85) --- updated-dependencies: - dependency-name: third_party/ot-br-posix/repo dependency-version: 032aa85489a5595d69a51e59c8869584e8b34da6 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Update Ameba builds to docker version 199 * [Telink] Update builds to docker version 199 * [Telink] clean configs * [Telink] Update builds to docker version 200 * [Telink] revert style * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * [Telink] Keep [NXP] image on version 199 * [Telink] fix builds * [Telink] fix builds --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Bumps [actions/github-script](https://github.com/actions/github-script) from 7.1.0 to 9.0.0. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](actions/github-script@f28e40c...3a2844b) --- updated-dependencies: - dependency-name: actions/github-script dependency-version: 9.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…sis (#72479) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.6.2 to 7.0.1. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@ea165f8...043fb46) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: 7.0.1 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…#72477) Bumps [Wandalen/wretry.action](https://github.com/wandalen/wretry.action) from 1.4.10 to 3.8.0. - [Release notes](https://github.com/wandalen/wretry.action/releases) - [Commits](Wandalen/wretry.action@1a10d48...e68c23e) --- updated-dependencies: - dependency-name: Wandalen/wretry.action dependency-version: 3.8.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Andrei Litvin <andy314@gmail.com>
…(#72480) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.6.2 to 7.0.1. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@ea165f8...043fb46) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: 7.0.1 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [Wandalen/wretry.action](https://github.com/wandalen/wretry.action) from 1.4.10 to 3.8.0. - [Release notes](https://github.com/wandalen/wretry.action/releases) - [Commits](Wandalen/wretry.action@1a10d48...e68c23e) --- updated-dependencies: - dependency-name: Wandalen/wretry.action dependency-version: 3.8.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Andrei Litvin <andy314@gmail.com>
…hyr changes (#72481) * Update image * Add new line line at end of docker file * Update hash * Update version * Restore installation of all Zephyr pythongdeps * Remove outdated comment * Restyled by whitespace --------- Co-authored-by: Restyled.io <commits@restyled.io>
…72487) * [clang-tidy] Enable core/cplusplus/security static-analyzer checks The .clang-tidy Checks block carries -clang-analyzer-... disable lines but no clang-analyzer-* positive, and the pigweed clang-tidy used in CI does not enable the analyzer family by default. As a result the path-sensitive static analyzer (null-deref, out-of-bounds, use-after-free/double-free, uninitialized reads, etc.) does not run at all in the clang-tidy CI step. Add clang-analyzer-core.*, clang-analyzer-cplusplus.*, clang-analyzer-security* and clang-analyzer-unix.Malloc as positives, keep the checkers that only produce false positives or intentional-pattern hits disabled (each with an inline rationale), and fix the findings that blocked enabling the rest: - initialize out-parameters before passing them to encode helpers in the General/Software/Ethernet diagnostics clusters and in the interaction-model trace decoder (which read an uninitialized id on a malformed-TLV path) - initialize attribute out-vars read by several cluster unit tests - guard memcmp() against null zero-length buffers in crypto unit tests (passing null to memcmp is undefined behavior even when the length is 0) - use ASSERT_EQ for a create-then-dereference precondition in a UDC test Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * [clang-tidy] Move disable rationale to YAML comments above Checks `Checks:` is a YAML folded block scalar, so `#` inside it is literal text parsed as a check glob, not a comment. Move the rationale for the disabled cplusplus.Move / cplusplus.NewDeleteLeaks checks to real YAML comments above the block to avoid the footgun and keep the check list clean. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Darwin: Use Linux PCSC NFCCommissioningManagerImpl on Mac NFC support via PCSC can then be enabled with chip_enable_nfc_based_commissioning = true Mainly this involves just making sure the pcsc/winstypes like LONG are used consistently, since they map to different underlying types on Linux and Mac, and ensuring callbacks for correctly with the Darwin platform layer that uses a dispatch queue instead of a global lock. Also make ChipLogValueX64 cast to uint64_t first rather than assuming it, since the NFC code calls it with values of other types (e.g. LONG). * Address review comments * Address review comments * Link PCSC.framework on macOS * Move globals into NFCCommissioningManagerImpl... ... and use Global<> to be able to defer construction, since for Matter.framework non-trivial static initializers are disallowed. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Link PCSC into dft, due to its weird build setup --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
- SoftwareVersionCertificationStatusEnum is a DCL-only type, not a data model type; it probably shouldn't even appear in our XML. - The Steam value of ModeTag in the Oven Mode cluster was incorrectly marked as introduced a while ago, but was only added to the XML recently; this fixes its introduction release to be correct. - The other bits are just explicitly marking various stuff as "not shipping this yet, need to evaluate".
* Update cluster XML based on latest spec updates See CHIP-Specifications/connectedhomeip-spec#12939 * zap regen * PDC/NETIM: Align implementation with latest spec - Add ClientIndex as a query option to QueryIdentity - Add ClientIdentityType to ClientStruct and store in the storage layer - Reject future NASS timestamps in ImportAdminSecret if the clock is synchronized * Make ClangTidy happy and use MockClock for all cluster test cases Also do time math in Seconds32 and factor out a named constant for max skew.
* Implement a generic "look-up" snippet for finding $CHIP_ROOT * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Add missing import * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Remove file commited in by mistake * Remove unneeded whitespace changes * Remove unneeded CHIP_REPO cals * CHIP root will always be a Path * Annotate return value for get_chip_root --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Fix ESP32 compilation error by adding water-heater-management-server to BUILD.gn * Temporary commit: update cicd config to test waterheater to test build * Undo temporary change
Bumps [Wandalen/wretry.action](https://github.com/wandalen/wretry.action) from 1.4.10 to 3.8.0. - [Release notes](https://github.com/wandalen/wretry.action/releases) - [Commits](Wandalen/wretry.action@v1.4.10...e68c23e) --- updated-dependencies: - dependency-name: Wandalen/wretry.action dependency-version: 3.8.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [advanced-security/filter-sarif](https://github.com/advanced-security/filter-sarif) from 1.0.1 to 1.1. - [Release notes](https://github.com/advanced-security/filter-sarif/releases) - [Commits](advanced-security/filter-sarif@f3b8118...2da736f) --- updated-dependencies: - dependency-name: advanced-security/filter-sarif dependency-version: '1.1' dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
… failure. (#72485)
* Fix Wi-Fi PAF buffer overflow and DoS via minimum fragment size and receive window clamping Enforces minimum safe fragment size clamping (>= kTransferProtocolMaxHeaderSize + 1) on both sides of the Wi-Fi PAF Transport Protocol handshake and rejects under-sized link MTUs. Also applies robust receive window upper clamping across both Wi-Fi PAF and BLE central endpoints. * Address Copilot review feedback: validate window size > 0 and log clamped window size Enforces non-zero peer receive window validation in BLEEndPoint to prevent underflow of sequence window tracking and logs negotiated (clamped) receive window sizes across both BLE and Wi-Fi PAF central endpoints.
Bumps [pyTooling/Actions](https://github.com/pytooling/actions) from 0.4.5 to 7.10.1. - [Release notes](https://github.com/pytooling/actions/releases) - [Changelog](https://github.com/pyTooling/Actions/blob/dev/doc/Releases.rst) - [Commits](pyTooling/Actions@cc576ce...0fe6a39) --- updated-dependencies: - dependency-name: pyTooling/Actions dependency-version: 7.10.1 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [third_party/ot-br-posix/repo](https://github.com/openthread/ot-br-posix) from `032aa85` to `e81bb97`. - [Release notes](https://github.com/openthread/ot-br-posix/releases) - [Commits](openthread/ot-br-posix@032aa85...e81bb97) --- updated-dependencies: - dependency-name: third_party/ot-br-posix/repo dependency-version: e81bb97dbf2a06cc5afbbcc73f843d246aaecbb9 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [third_party/openthread/repo](https://github.com/openthread/openthread) from `318b4b0` to `1b80561`. - [Release notes](https://github.com/openthread/openthread/releases) - [Commits](openthread/openthread@318b4b0...1b80561) --- updated-dependencies: - dependency-name: third_party/openthread/repo dependency-version: 1b805618025e406f85227187e3f2bc0b73fa17bd dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
… requirements (#72507)
* [Infineon]HSM Matter SDK Code Improvement and Bug Fixes 1)DRBG_get_bytes() previously returned CHIP_NO_ERROR unconditionally regardless of the underlying optiga_crypt_rng()status. 2)Added upper limit check on out_length upper limit 3)Added return status for trustm_Open() and write_data() 4)Removed the Trust M NOC related code 5)Pre-loaded Trust M Attestation Certs 6)Added Trust M as Entropy source by default for mbedtls_entropy_add_source() when ENABLE_TRUSTM_RANDOM = 0 7)WAIT_FOR_COMPLETION yields with pal_os_timer_delay_in_milliseconds(1) while Trust M is busy instead of spinning the calling task. 8)Removed unused function trustm_PBKDF2_HMAC() 9)Increased buffer size for read_certificate_from_optiga() to cater for larger certificate size. 10)Added Shielded Connection protection level options which can be configured by the user's application. Testing Manually tested on PSoC6 + OPTIGA Trust M: Commissioning and post-commissioning operation with ENABLE_TRUSTM_RANDOM=1 and =0. Shielded connection enabled (OPTIGA_COMMS_SHIELDED_CONNECTION) * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * 1)Use chip::Crypto::ClearSecretData instead of memset to securely clear the sensitive seed_buf buffer 2)Add validation to ensure ifx_cert_hex_len is non-zero and at least offset_to_read before performing the subtraction 3)Verify that secret_length does not exceed the capacity of out_secret 4)Fix: PreloadTrustMAttestationCerts() leaves stale cert lengths on early failure 5)Fix: trustmGetCertificate() buffer overflow when buffer is too small 6)Fix: trustm_close() NULL dereference on partial initialization * 1)Delete the unused header * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Updated preprocessor conditionals for ENABLE_TRUSTM_RANDOM * Modifications based on code review - Use PSOC 6 and Trust M for entropy source - Minor code improvements * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Code improvements. --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Ank Khandelwal <ank.khandelwal@infineon.com>
* Fix uint32 overflow in SecondsToMilliseconds SecondsToMilliseconds(uint32_t) returned `seconds * kMillisecondsPerSecond`. kMillisecondsPerSecond is an int, so the multiplication was performed in 32-bit (unsigned) arithmetic and wrapped modulo 2^32 once seconds * 1000 exceeds UINT32_MAX -- i.e. for seconds >= 4294968 (~49.7 days) -- before the result was widened to the uint64_t return type. For example SecondsToMilliseconds(4294968) returned 704 instead of 4294968000. Widen the operand to uint64_t so the multiplication is evaluated in 64 bits. The deprecated secondsToMilliseconds alias forwards here and is fixed too. Found by clang-tidy bugprone-implicit-widening-of-multiplication-result. Adds TestTimeUtils.TestSecondsToMilliseconds (red before, green after). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Andrei Litvin <andy314@gmail.com>
When Spake2+ implementation for PSA crypto API is enabled: - do not build the generic Spake2p nor its subclasses - do not build Spake2pVerifier::Generate method that generates the verifier key out of the passcode, salt and iteration count. Instead, provide the implementation Spake2pVerifier::Generate that uses PSA crypto API. Note that using Spake2pVerifier::Generate requires setting CONFIG_PSA_WANT_ALG_PBKDF2_HMAC and CONFIG_PSA_WANT_KEY_TYPE_SPAKE2P_KEY_PAIR_DERIVE Kconfig options. Signed-off-by: Damian Krolik <damian.krolik@nordicsemi.no> (cherry picked from commit aa2e056) Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
We can speed up flash operations while performing a factory reset by disabling mpsl before that. Thanks to that flash operations do not wait for mpsl synchronization and all write operations take less time. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
Extend MapSendError to treat TX buffer exhaustion (e.g. ERR_MEM, ENOBUFS) and temporary network connection issues (e.g. ERR_CONN, ENETDOWN) as non-fatal errors. This prevents premature teardown of exchanges or subscriptions in transient conditions. Signed-off-by: Łukasz Duda <lukasz.duda@nordicsemi.no>
Added functionality that can be enabled using Kconfig option and allows to measure the time between factory reset schedule and factory reset end to know this process duration. Signed-off-by: Kamil Kasperczyk <kamil.kasperczyk@nordicsemi.no>
For certification testing it is better to have two locales instead of one. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
…window Added commands to open and close basic commissioning window using shell that can be used for test purposes. Signed-off-by: Kamil Kasperczyk <kamil.kasperczyk@nordicsemi.no>
In some cases, we do not want to use x509 for Matter purposes, but it can be used for different use cases. In order to allow doing that and reducing the Matter footprint added the chip_crypto_use_x509 define that can control when the X509-related functions are added to the compilation. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
Added the CHIP_CRYPTO_USE_X509 kconfig option to enable or disable the x509 certificate processing for nrfconnect devices. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
To OPENTHREAD_SECURITY_CONFIG just as was done in Zephyr. Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no> [nrf toup][nrfconnect] remove CONFIG_NRF_SECURITY_ADVANCED It has been unused for some time and is about to be removed in NCS. Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no> [nrf toup][nrfconnect] add missing Mbed TLS Kconfig option Add missing dependency CONFIG_MBEDTLS_X509_CRT_PARSE_C to test_driver configuration. Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no> [nrf toup] rename CONFIG_MBEDTLS_CFG_FILE To CONFIG_MBEDTLS_CONFIG_FILE. Change comes from Zephyr. Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no> [nrf toup] remove CONFIG_OPENTHREAD_NRF_SECURITY_CHOICE This option is removed from NCS. Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no> [nrf noup] Update crypto configuration variables With the new TF-PSA-CRYPTO there are renames in the variables: MBEDTLS_PSA_CRYPTO_CONFIG_FILE -> TF_PSA_CRYPTO_CONFIG_FILE MBEDTLS_PSA_CRYPTO_USER_CONFIG_FILE -> TF_PSA_CRYPTO_USER_CONFIG_FILE Rename these variables accordingly here. Noup as the upstream repo still compiles with mbedTLS 3.6.5 which does not have these names. Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no> [nrf noup] config: Remove nrf-config.h parameter This is not used anymore when TLS is not enabled. I need to double check if this causes any problem when TLS is enabled and remove this message later :) Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no> [nrf toup] remove enabling of CONFIG_NORDIC_SECURITY_BACKEND It has been removed. Replace it with CONFIG_PSA_CRYPTO. In addition, fix some spacing issues in the same file. Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no> [nrf toup] adjust Mbed TLS configuration defaults Remove options that are gone. Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no> config: Remove OBERON_BACKEND The mbedTLS legacy crypto library with Oberon is not available with the new TF-PSA-Crypto and thus this Kconfig option is removed. Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
- There should not be dependency to the Partition Manager if it is
not enabled.
- Fix wrongly referring to partitions as alises
- To properly resolve `@{ZEPHYR_NRF_MODULE_DIR}` we need to use
string(CONFIGURE ...) on it.
- Add Kconfig to set the proper CHIP_APP_ZAP_DIR if the
custom location of the zap-generated files is used.
- Fix Factory Data to put files in the correct place and run
with the correct configuration
Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
Co-authored-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
The obsolete nosys.spec is no more needed with the new Zephyr version. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
Normalize Zephyr compile flags before exporting them to Matter GN args by rewriting `$<TARGET_PROPERTY:LTO>` to `$<TARGET_PROPERTY:zephyr_interface,LTO>`. This avoids CMake generate-time failures in `file(GENERATE)` after recent Zephyr LTO/KERNEL_NO_LTO changes. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
Kconfigs for CHIP_NUS are not used in practice anywhere, so can be removed. Signed-off-by: Kamil Kasperczyk <kamil.kasperczyk@nordicsemi.no>
The make_gn_args.py read args.tmp and uses argparse that treats any line starting with - as an option, not as a positional value for --arg-cflags. When including only a single -D option, for example in TF-M builds that only export -DTF_PSA_CRYPTO_CONFIG_FILE=... on target_cflags, the parser fails with argument --arg-cflags: expected 2 arguments Signed-off-by: Kamil Kasperczyk <kamil.kasperczyk@nordicsemi.no>
To PSA_KEY_ID_FROM_CRACEN_KMU_SLOT. Renaming was done in sdk-nrf. Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
Guard the includes depending on the Mbed TLS version. Also ecp.h now lives inside the TF-PSA-Crypto repo, and they chaged the path add a private prefix, so adapt to that as well. Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no> [nrf toup] crypto: Removed unused include x509_csr.h seems to be unsed in CHIPCryptoPALPSA.cpp so remove it. Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no> [nrf noup] crypto: Guard unused includes Guard all the mbedTLS related includes based on the CHIP_CRYPTO_USE_X509 define, since when this is not defined all the functions in the file seem to just return an error of not supported and thus the includes are not used. Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
Add `CHIP_BLE_MULTI_IDENTITY_SUPPORT` Kconfig option. Filter Matter BLE manager and advertising arbiter callbacks to only handle connections on the Matter BLE identity. Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
Replace the sWasDisconnection flag with an atomic restart flag so advertising can be retried when bt_le_adv_start() fails due to lack of available connection object. With CONFIG_CHIP_BLE_MULTI_IDENTITY_SUPPORT, disconnect and recycled callbacks can arrive in an order where a restart attempt runs before all connection slots are available. Re-arm the flag on failure so a subsequent recycled callback schedules another restart attempt. Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
Aligned Matter kconfigs to newest Matter and sdk-nrf revisions. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no> [nrf toup][nrfconnect] Align Common Kconfigs to Zephyr requirements According to Zephyr requirements Kconfigs' prompt should not start with "Enable". Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
Removed redundant MBEDTLS_USE_PSA_CRYPTO from CHIP_CRYPTO_PSA. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
Changing CRACEN_LIB_KMU Kconfig option to CRACEN_KMU since LIB_KMU is exchanged with NRFX KMU driver. Signed-off-by: Anton Zyma <anton.zyma@nordicsemi.no>
After introducing the CHIP_DEVICE_CONFIG_ICD_SIT_POLLING_INTERVAL Matter Device Config, we can have it also in the Zephyr's CONFIG_CHIP_ICD_SIT_POLLING_INTERVAL Kconfig to set this option via menuconfig. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no> Cherry-picked from: a59e97889df519bcdf1348c93e25f60e18ec2e7ab
Implying OpenThread shell together with CHIP_LIB_SHELL blocks manipualting this kconfig in the other Zephyr-related platforms Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
ArekBalysNordic
force-pushed
the
upmerge_1_6
branch
from
July 29, 2026 11:14
dbd08f5 to
a0af57e
Compare
The nRF70 Wi-Fi firmware patch DFU feature has been removed from sdk-nrf, including the NRF_WIFI_FW_PATCH_DFU Kconfig option. Remove the default override for it here, which otherwise triggers a "defined without a type" Kconfig error now that the option no longer exists. Also drop the UPDATEABLE_IMAGE_NUMBER and DFU_MULTI_IMAGE_MAX_IMAGE_COUNT overrides that accounted for the firmware patch as a separate updatable and DFU image, as the patch is no longer an MCUboot image. Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
NordicBuilder
added a commit
to NordicBuilder/sdk-nrf
that referenced
this pull request
Jul 29, 2026
Automatically created by action-manifest-pr GH action from PR: nrfconnect/sdk-connectedhomeip#730 Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
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
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.
Summary
Update Matter SDK to 1.6 version.
Testing
In ncs-matter Add-on