Skip to content

Matter Upmerge 1.6#717

Draft
ArekBalysNordic wants to merge 1822 commits into
nrfconnect:masterfrom
ArekBalysNordic:upmerge_pre_1_6
Draft

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

Conversation

@ArekBalysNordic
Copy link
Copy Markdown
Contributor

@ArekBalysNordic ArekBalysNordic commented Apr 24, 2026

Summary

Draft of Update Matter SDK revision to 1.6.

Testing

NCS

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

CLAassistant commented Apr 24, 2026 •
edited
Loading

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.
5 out of 8 committers have signed the CLA.

✅ ArekBalysNordic
✅ kkasperczyk-no
✅ LuDuda
✅ tomi-font
✅ adigie
❌ Damian-Nordic
❌ Vge0rge
❌ LipinskiPNordicSemi
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
Open
NordicBuilder added a commit to NordicBuilder/sdk-nrf that referenced this pull request Apr 24, 2026
@NordicBuilder
manifest: Update sdk-connectedhomeip revision (auto-manifest PR)
4d31076 
Automatically created by action-manifest-pr GH action from PR:
nrfconnect/sdk-connectedhomeip#717

Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
NordicBuilder added a commit to NordicBuilder/sdk-nrf that referenced this pull request Apr 24, 2026
@NordicBuilder
manifest: Update sdk-connectedhomeip revision (auto-manifest PR)
8a76aae 
Automatically created by action-manifest-pr GH action from PR:
nrfconnect/sdk-connectedhomeip#717

Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
ArekBalysNordic and others added 28 commits May 29, 2026 17:07
@ArekBalysNordic
[nrf toup][crypto] Add define to enable x509 usage
1ac925c 
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
154cb8b 
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] rename OPENTHREAD_SECURITY Kconfig choice
76a8695 
To OPENTHREAD_SECURITY_CONFIG just as was done in Zephyr.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
@tomi-font @ArekBalysNordic
[nrf toup][nrfconnect] remove CONFIG_NRF_SECURITY_ADVANCED
b34de19 
It has been unused for some time and is about to be removed in NCS.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
@tomi-font @ArekBalysNordic
[nrf toup][nrfconnect] add missing Mbed TLS Kconfig option
42a5db5 
Add missing dependency CONFIG_MBEDTLS_X509_CRT_PARSE_C to test_driver
configuration.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
@ArekBalysNordic @nordicjm
[nrf toup] Migrate to non-PM builds
391c98c 
- 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 noup] [west zap-gui] Add fix-permission argument
cbed29e 
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>
@tomi-font @ArekBalysNordic
[nrf toup] rename CONFIG_MBEDTLS_CFG_FILE
b0354ea 
To CONFIG_MBEDTLS_CONFIG_FILE. Change comes from Zephyr.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
@ArekBalysNordic
[nrf toup] Remove redundant nosys.specs
9b6c77d 
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
7e4a0ec 
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
a0e99de 
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
899bb8a 
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] remove CONFIG_OPENTHREAD_NRF_SECURITY_CHOICE
c94f7d9 
This option is removed from NCS.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
@tomi-font @ArekBalysNordic
[nrf toup] rename PSA_KEY_HANDLE_FROM_CRACEN_KMU_SLOT
7c5e10c 
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 noup] Update crypto configuration variables
8e3cf38 
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>
@Vge0rge @ArekBalysNordic
[nrf noup] config: Remove nrf-config.h parameter
45b8121 
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>
@tomi-font @ArekBalysNordic
[nrf toup] remove enabling of CONFIG_NORDIC_SECURITY_BACKEND
56330cb 
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>
@tomi-font @ArekBalysNordic
[nrf toup] adjust Mbed TLS configuration defaults
f067932 
Remove options that are gone.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
@Vge0rge @ArekBalysNordic
config: Remove OBERON_BACKEND
7afbe23 
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>
@Vge0rge @ArekBalysNordic
[nrf toup] crypto: Update includes for mbedTLS > 4
a2cf3a4 
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>
@Vge0rge @ArekBalysNordic
[nrf toup] crypto: Removed unused include
e1b1bcf 
x509_csr.h seems to be unsed in CHIPCryptoPALPSA.cpp
so remove it.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
@Vge0rge @ArekBalysNordic
[nrf noup] crypto: Guard unused includes
8669c27 
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
73a0960 
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
8adf979 
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] Do not use GNU strerror while using Zephyr
4fa66b7 
In some cases GNU_SOURCE may be enabled and due to that
a wrong strerror implementation is used for Zephyr platform.
To prevent this, exclude ZEPHYR if GNU_SOURCE is enabled.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
@ArekBalysNordic
[nrf toup][nrfconnect] Align Matter kconfig
74bf7d6 
Aligned Matter kconfigs to newest Matter and sdk-nrf revisions.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
@ArekBalysNordic
[nrf toup] Align Common Kconfigs to Zephyr requirements
0dd87f5 
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
95e7679 
Removed redundant MBEDTLS_USE_PSA_CRYPTO from CHIP_CRYPTO_PSA.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
NordicBuilder added a commit to NordicBuilder/sdk-nrf that referenced this pull request May 29, 2026
@NordicBuilder
manifest: Update sdk-connectedhomeip revision (auto-manifest PR)
3785e71 
Automatically created by action-manifest-pr GH action from PR:
nrfconnect/sdk-connectedhomeip#717

Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
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.