Skip to content

Matter Upmerge 1.6 - #717

Closed
ArekBalysNordic wants to merge 2061 commits into
nrfconnect:masterfrom
ArekBalysNordic:upmerge_pre_1_6
Closed

Matter Upmerge 1.6#717
ArekBalysNordic wants to merge 2061 commits into
nrfconnect:masterfrom
ArekBalysNordic:upmerge_pre_1_6

Conversation

@ArekBalysNordic

@ArekBalysNordic ArekBalysNordic commented Apr 24, 2026

Copy link
Copy Markdown
Contributor

Summary

Draft of Update Matter SDK revision to 1.6.

Testing

NCS

@NordicBuilder NordicBuilder mentioned this pull request Apr 24, 2026
Closed
@CLAassistant

CLAassistant commented Apr 24, 2026 •
edited
Loading

Copy link
Copy Markdown

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
6 out of 9 committers have signed the CLA.

✅ ArekBalysNordic
✅ tomi-font
✅ LuDuda
✅ kkasperczyk-no
✅ adigie
✅ AntonZma
❌ Damian-Nordic
❌ LipinskiPNordicSemi
❌ Vge0rge
You have signed the CLA already but the status is still pending? Let us recheck it.

@NordicBuilder NordicBuilder mentioned this pull request Apr 24, 2026
Closed
LipinskiPNordicSemi and others added 30 commits July 13, 2026 13:29
@LipinskiPNordicSemi @ArekBalysNordic
[nrf noup] Fix the build warning in door-lock-server
b62edb8 
This fixes the uninitialized variable warning
appearing when compiling the door lock app.

Signed-off-by: Patryk Lipinski <patryk.lipinski@nordicsemi.no>
(cherry picked from commit 7a795a6)
Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
@Damian-Nordic @ArekBalysNordic
[nrf noup] Add custom west commands to ease ZAP usage
d2a3eee 
Add "zap-gui" west command that runs ZAP GUI to edit
the requested ZAP file.

Add "zap-generate" west command that generates the cluster
code out of the requested ZAP file.

Both commands verify if a correct version of ZAP package
is installed in .zap-install directory in the Matter SDK
module, and update the installed version accordingly.

The commands also try to find the ZAP file in the current
directory if the ZAP file path is not explicitly provided.

(cherry picked from commit 6c0bf5c)
Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

[nrf noup] ZAP west command improvements

1. If multiple ZAP files are detected in the given location,
   ask a user to choose the one to edit.
2. Allow to provide a Matter SDK path to enable using the
   commands with the upstream repo.

Signed-off-by: Damian Krolik <damian.krolik@nordicsemi.no>
(cherry picked from commit 99505eb)
Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

[nrf noup][nrfconnect] Fix `zap-generate` `-o` path argument

Fix `-o` path argument to be absolute, or relative to current path.
Check if `-o` path argument is an existing directory.

Signed-off-by: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>
(cherry picked from commit c0df90b)
Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

[nrf noup] Added zap_append to west command

Added zap_append command to the west.

use `west zap-append -h` to see all options.

Now you can add new clusters to the matter ZCL datamodel.
Use a `west zap-append` and provide the new cluster
definitionsas XML files to add them to the zcl.json file.
You can generate the new zcl.json file by providing
`-o, --output` argument, or overwrite the existing one.

The zcl_generate is integrated with `west zap-gui` commands.
If you want to use it call the `west zap-gui` command with
the additional argument `--clusters`.
You can provide multiple clusters at once.
If you provide an additional `-j` / `--zcl-json` argument
alongside the `--clusters` argument to the `west zap-gui`
command, the new zcl.json will be created and contain
the new clusters.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>

[nrf toup][nrfconnect] Add `--full` flag to zap-generate

Add a `--full` flag that generates full data model and puts it
it `app-common/zap-generated` subdirectory.

Additionaly fix minor bug when equal paths have been shown as non-
relative and zap file is not properly updated with zcl.json file

Signed-off-by: Maciej Baczmanski <maciej.baczmanski@nordicsemi.no>

[nrf noup] Added a proper package name for MAC with ARM CPUs.

Now the script downloads the zap-mac-arm64.zip package if the
ARM64 machine is detected for Darwin OS.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>

[nrf noup] Check if ZAP file was found

Log error and return if ZAP file was not found

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

[nrf noup] Add zap-install command

Add west command to install ZAP

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

[nrf noup] Add `--keep-previous` argument to zap-generate

* Remove previous ZAP generated files.
* Add `-k`/`--keep-previous` argument to skip removing old files.

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

fix: handle paths on different drives in Windows for zap-gui

Signed-off-by: wanower <suguguan@qq.com>

[nrf noup] Use ZAP CLI for version check

Both `zap --version` and `zap-cli --version` do the same thing more or less, but `zap` is heavier to run since it starts Electron just to do `--version`. Since the user may only care about `zap-cli` commands (e.g. `west zap-generate`), requiring that all `west zap-*` commands call `zap` just to get a version check increases the amount of resources and dependencies required

Signed-off-by: Kendall Goto <kendall@level.co>

[nrf noup] Use proper ZAP package for Linux/Windows with ARM CPUs

Currently x86 ZAP is always downloaded on Linux/Windows. This change
looks at the architecture of the system to download either
x86_64 or arm64 binaries as provided by ZAP releases

Signed-off-by: Kendall Goto <kendall@level.co>

[nrf noup] remove nightly from zaptool URL.

There is no "nightly" in the TAG name anymore in Zaptool releases.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>

[nrf noup] Add generating .matter file to west zap-generate

In the new Matter revision we must have .matter file which is
to generate cluster-server-configs. To generate this file
we can call the additional zap function in west zap-generate.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>

[nrf toup][zap] Fix workaround in zap_generate

If the directory for the Pm2.5ConcentrationMeasurement cluster
does not exist, we must create it first.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>

[nrf noup] Extend zap-generate to process multiple files at once
Allows processing multiple zap files at once by providing
a yaml file with zap file list.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>

[nrf noup] Align full zap generation to changes in Matter Upstream

Now, the zap_generate Python script uses common targets to
generate Matter Data Model ZAP and Code from zap_regen_all.py,
located in the Matter SDK. This approach allows reusing of a
common script to generate the whole Data Model and append a
newly created cluster.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>

Restyled by isort

[nrf noup] Fix zap-generate script

There is a wrong logic for providing a custom zcl file.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>

[nrf noup] Add postprocessing generated files

Postprocessing is currently used to ensure that each generated
file contains exactly one blank line at the end.
This automatization allows keeping NCS codestyle requirements.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>

[nrf noup][ZAP] Fix clearing generated files.

The file.unlink funciton was called wrongly when the file
was still opened.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>

[nrf noup][ZAP] Improve west zap generate command

When arguments have a custom type (such as struct or enum), they
must be added to the `attributeAccessInterfaceAttributes` list in
the `zcl.json` file. If this is not done, the generated
Accessors.h/.cpp files will not have access to these custom types.

This commit introduces a new `add_custom_attributes` function to
the west `zap-append`/`zap-gui` command to handle updating the
zcl file with all custom-type attributes.

The second improvement is the ability to synchronize the zcl file
with the "base" zcl file located in the Matter SDK.
This is useful if the base file has changed, for example due to a
new Matter SDK version, and the custom zcl file does not contain
all the "base" clusters.

Both improvements are necessary only when calling west
`zap-generate` with the `--full` argument.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>

[nrf noup][ZAP] Improve west zap commands

* Now we can obtain the recommended zap version from the
`scripts/setup/zap.version` file instead of reading it from
the `zap_execution.py` file. Sometimes the nightly version is
recommended whereas in the python file there is no `-nightly`
postfix.

* If the sandbox is not configured on a Linux PC, an annoying
issue with the sandbox occurs after updating to the newest ZAP
tool.
To resolve it, ask the  user if they want to add permissions
automatically.

* `update_zcl_in_zap` function must be called only while
the specific clusters are known.

* Added the new zap-update command to synchronize the .zap and
zcl.json files with the new Matter Data Model from SDK.

Restyled by prettier-yaml

Restyled by isort

Restyled by ruff

[nrf noup][west zap] Add unit tests for west zap command

- Now the zcl.json contains the rules for zap-tool that are
used with generating a zap file. The rules file is the JSON file
that contains relative paths to .js files. To properly synchronize
a custom zcl.json file, we must copy this rules file, update
all paths to be relative to the custom zcl.json and finally run
zap-gui or zap-sync with all proper paths.

Apart from the synchronization updates several issues with zap
generated and added helper functions for obtaining paths.

Covered all major scenarios for all west zap commands in unit
tests.

Added a github workflow to run the tests if any west script is
changed.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>

[nrf noup][ZAP] Extend unit tests to check zap-generate full

Make sure that west zap-generate full that was run with -y argument
creates the same content as zap-generate --full.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>

[nrf noup] [west zap-gui] Add fix-permission argument

The new argument allows setting a proper sandbox permissions
to new ZAPtool installation if the gui execution fails without
any errors.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>

[nrf noup] [west zap-append] Add fallback to the attribute name deduction

Some XML cluster definitions do not contain the dedicated
'name' entry in the attribute field, instead they just
add name of the cluster as a text to the attribute
definition. Added a fallback logic, so that such cases
are handled to avoid ending up with null attributes in
zcl.json file. This mimics the ZAP loader behavior.

Signed-off-by: Marcin Kajor <marcin.kajor@nordicsemi.no>

[nrf noup] [west zap-sync] Handle overwriting of the default zcl file

Fixed the handling of the case when the default
cluster definition file (zcl.json) is used as both
input and output to the command. Without the fix,
the script removes the zcl.json and exits, because
the removed file cannot be copied.

Signed-off-by: Marcin Kajor <marcin.kajor@nordicsemi.no>

[nrf noup] [west zap-gui] Refine error handling

It turns out that the subprocess may return no output
if the Chromium cannot use sandbox due to the missing
permissions. Added a workaround that raises an exception
if the command execution output is empty, so that it
can be handled with the fix_sandbox_permissions() call.

Signed-off-by: Marcin Kajor <marcin.kajor@nordicsemi.no>

[nrf noup] [west zap-*] Apply copilot suggestions

- Refined error handling
- Reduced the verbosity

Signed-off-by: Marcin Kajor <marcin.kajor@nordicsemi.no>
@ArekBalysNordic
[nrf toup][scripts] Fix running generate for Windows
0da89d3 
If the host system is Windows, we need to add `python3` to the
subprocess command to avoid issues like:
`OSError: [WinError 193] %1 is not a valid Win32 application`

Also, inform Windows users what they can do if paths to the
files are too long, and how to resolve issues like:
`FileNotFoundError: [WinError 206] The filename or extension is
too long`

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>

[nrf toup][scripts] Fix running generate for Windows

The commit contains new fixes in zap_regen_all.py for Windows
platform. The issues occur especially on Windows 11.

It can be merged squashed with the
c34b9e5 commit.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
@ArekBalysNordic
[nrf toup] Migrate DAC to CRACEN KMU on nRF54L devices
e5484fd 
On nRF54L devices we can use KMU to store the DAC private key,
and allow using it directly by CRACEN.
By default the DAC private key is encrypted so it needs
4 KMU slots.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
(cherry picked from commit 5580536)
Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

[nrf noup][nrfconnect] Enabled DAC migration by default for Thread

Enabled DAC migration for all targets using Thread protocol,
as Wi-Fi does not support PSA yet.

Signed-off-by: Kamil Kasperczyk <kamil.kasperczyk@nordicsemi.no>
(cherry picked from commit 700233b)
Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

[nrf noup][nrfconnect] Fix DAC migration

- Fixed wrong dependency in Kconfigs
- Fixed wrong bracket placement that causes overwriting DAC private
key.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
(cherry picked from commit 668f104)
Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

[nrf noup][nrfconnect] Enable storing DAC key in KMU by default

Enabled storing the DAC private key in KMU if it is available.
It enables storing the DAC private key in KMU for nRF54L15 device.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
(cherry picked from commit aa968a6)
Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
@kkasperczyk-no @ArekBalysNordic
[nrf noup] Added workaround to pass nRF compliance check
dcb4452 
Added undefined CHIP_NXP_PLATFORM and CHIP_TELINK_PLATFORM
configs to pass compliance check.

Signed-off-by: Kamil Kasperczyk <kamil.kasperczyk@nordicsemi.no>
(cherry picked from commit a497f79)
Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
@ArekBalysNordic
[nrf noup] Shedule factory reset in Server using Matter Shell command
983432e 
It is better to call the ScheduleFactoryReset method from
the Server, because it also removes all fabrics and emits the Leave
event whereas calling InitiateFactoryReset() removes only the
persistent storage entries.

In this way, the Matter Shell command works in the same way as
other factory reset sources.

We cannot upmerge it in an easy way because many vendors do not
use chip server and there are multiple building issues.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
(cherry picked from commit 973259c)
Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

[nrf noup] Remove dependncy to Server

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@gmail.com>
@Damian-Nordic @ArekBalysNordic
[nrf noup] Implement Spake2pVerifier for PSA crypto
5af7797 
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>
@ArekBalysNordic
[nrf noup] Disable mpsl before factory reset
1436e9d 
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>
@LuDuda @ArekBalysNordic
[nrf toup] Handle network connection errors gracefully
b3d16b1 
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>
@kkasperczyk-no @ArekBalysNordic
[nrf noup] Added measuring factory reset time
57ffe39 
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>
@ArekBalysNordic
[nrf toup] Add second locale to DeviceInfoProviderImpl.h
1aaad40 
For certification testing it is better to have two locales
instead of one.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
@kkasperczyk-no @ArekBalysNordic
[nrf toup][shell] Add commands for opening and closing commissioning …
7237dcc 
…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>
@ArekBalysNordic
[nrf toup][crypto] Add define to enable x509 usage
293e396 
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>
@ArekBalysNordic
[nrf toup][nrfconnect] Add kconfig to control X509 usage
38ed2c0 
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>
@tomi-font @ArekBalysNordic
[nrf toup][nrfconnect] nRFConnect platform Crypto fixes
0ad8da7 
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>
@ArekBalysNordic @nordicjm
[nrf toup] Migrate to non-PM builds
56594e0 
- 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>
@ArekBalysNordic
[nrf toup] Remove redundant nosys.specs
5c6e577 
The obsolete nosys.spec is no more needed with the new Zephyr
version.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
@ArekBalysNordic
[nrf toup] Normalize Zephyr compile flags before exporting to GN
810754c 
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>
@kkasperczyk-no @ArekBalysNordic
[nrf toup][nrfconnect] Removed kconfigs for CHIP_NUS
ac8cfa0 
Kconfigs for CHIP_NUS are not used in practice anywhere,
so can be removed.

Signed-off-by: Kamil Kasperczyk <kamil.kasperczyk@nordicsemi.no>
@kkasperczyk-no @ArekBalysNordic
[nrf toup][config] Fixed gn parser implementation
a6070d1 
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>
@tomi-font @ArekBalysNordic
[nrf toup] rename PSA_KEY_HANDLE_FROM_CRACEN_KMU_SLOT
1c1059c 
To PSA_KEY_ID_FROM_CRACEN_KMU_SLOT. Renaming was done in sdk-nrf.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
@Vge0rge @ArekBalysNordic
[nrf toup][crypto] Update includes for mbedTLS > 4
3a4e140 
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>
@adigie @ArekBalysNordic
[nrf toup][nrfconnect] Add support for multiple BT identities
8414496 
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>
@adigie @ArekBalysNordic
[nrf toup][nrfconnect] Retry BLE advertising restart
8e49451 
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>
@ArekBalysNordic
[nrf toup][nrfconnect] Align Matter kconfig
f716f97 
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>
@ArekBalysNordic
[nrf toup][Zephyr] Remove redundant mbedtls kconfig
d8e19e7 
Removed redundant MBEDTLS_USE_PSA_CRYPTO from CHIP_CRYPTO_PSA.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
@AntonZma @ArekBalysNordic
[nrf toup] Exchange CRACEN_LIB_KMU with CRACEN_KMU
28ea37b 
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>
@ArekBalysNordic
[nrf fromtree] zephyr: Add ICD_SIT_POLLING_INTERVAL to common Kconfigs
1ae7e7c 
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
@ArekBalysNordic
[nrf toup][Zephyr] Remove implying OpenThread shell
f9a4bb2 
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
Add missing items in release workflows
9ffae61
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

config darwin docker documentation Improvements or additions to documentation esp32 examples chef examples github gn integrations linux nrf connect nxp platform realtek scripts silabs telink tizen tools vscode workflows

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.