From 06301c5e4955b9fcc8c43200b132f822f0117e83 Mon Sep 17 00:00:00 2001 From: Tomi Fontanilles Date: Mon, 13 Apr 2026 11:53:44 +0300 Subject: [PATCH 1/3] [nrf toup] rename CONFIG_MBEDTLS_CFG_FILE To CONFIG_MBEDTLS_CONFIG_FILE. Change comes from Zephyr. Signed-off-by: Tomi Fontanilles --- config/nxp/chip-module/Kconfig.defaults | 2 +- config/telink/chip-module/CMakeLists.txt | 2 +- .../nrfconnect/sysbuild/mcuboot/prj.conf | 2 +- examples/pump-app/nrfconnect/sysbuild/mcuboot/prj.conf | 2 +- .../pump-controller-app/nrfconnect/sysbuild/mcuboot/prj.conf | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/nxp/chip-module/Kconfig.defaults b/config/nxp/chip-module/Kconfig.defaults index b229b253575..8ba2fe54d65 100644 --- a/config/nxp/chip-module/Kconfig.defaults +++ b/config/nxp/chip-module/Kconfig.defaults @@ -378,7 +378,7 @@ endif config MBEDTLS default y -config MBEDTLS_CFG_FILE +config MBEDTLS_CONFIG_FILE default "config-tls-generic.h" config MBEDTLS_PSA_KEY_SLOT_COUNT diff --git a/config/telink/chip-module/CMakeLists.txt b/config/telink/chip-module/CMakeLists.txt index cd6a21163b6..627ffab78ba 100644 --- a/config/telink/chip-module/CMakeLists.txt +++ b/config/telink/chip-module/CMakeLists.txt @@ -65,7 +65,7 @@ matter_add_cxxflags("${ZEPHYR_CFLAGS_CC}") zephyr_get_gnu_cpp_standard(ZEPHYR_GNU_CPP_STD) matter_add_cxxflags(${ZEPHYR_GNU_CPP_STD}) -matter_add_flags(-DMBEDTLS_USER_CONFIG_FILE=<${CONFIG_MBEDTLS_CFG_FILE}>) +matter_add_flags(-DMBEDTLS_USER_CONFIG_FILE=<${CONFIG_MBEDTLS_CONFIG_FILE}>) # Set up custom OpenThread configuration diff --git a/examples/all-clusters-minimal-app/nrfconnect/sysbuild/mcuboot/prj.conf b/examples/all-clusters-minimal-app/nrfconnect/sysbuild/mcuboot/prj.conf index 3bcb12fe7b8..f881b2d41ee 100644 --- a/examples/all-clusters-minimal-app/nrfconnect/sysbuild/mcuboot/prj.conf +++ b/examples/all-clusters-minimal-app/nrfconnect/sysbuild/mcuboot/prj.conf @@ -23,7 +23,7 @@ CONFIG_PM=n CONFIG_FLASH=y CONFIG_FPROTECT=y -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" # Use minimal C library instead of the Picolib CONFIG_MINIMAL_LIBC=y diff --git a/examples/pump-app/nrfconnect/sysbuild/mcuboot/prj.conf b/examples/pump-app/nrfconnect/sysbuild/mcuboot/prj.conf index 3bcb12fe7b8..f881b2d41ee 100644 --- a/examples/pump-app/nrfconnect/sysbuild/mcuboot/prj.conf +++ b/examples/pump-app/nrfconnect/sysbuild/mcuboot/prj.conf @@ -23,7 +23,7 @@ CONFIG_PM=n CONFIG_FLASH=y CONFIG_FPROTECT=y -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" # Use minimal C library instead of the Picolib CONFIG_MINIMAL_LIBC=y diff --git a/examples/pump-controller-app/nrfconnect/sysbuild/mcuboot/prj.conf b/examples/pump-controller-app/nrfconnect/sysbuild/mcuboot/prj.conf index 3bcb12fe7b8..f881b2d41ee 100644 --- a/examples/pump-controller-app/nrfconnect/sysbuild/mcuboot/prj.conf +++ b/examples/pump-controller-app/nrfconnect/sysbuild/mcuboot/prj.conf @@ -23,7 +23,7 @@ CONFIG_PM=n CONFIG_FLASH=y CONFIG_FPROTECT=y -CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" +CONFIG_MBEDTLS_CONFIG_FILE="mcuboot-mbedtls-cfg.h" # Use minimal C library instead of the Picolib CONFIG_MINIMAL_LIBC=y From 89bfdc3e9140f1c694e1826e84a7931494fff5b4 Mon Sep 17 00:00:00 2001 From: Arkadiusz Balys Date: Thu, 23 Apr 2026 11:26:25 +0200 Subject: [PATCH 2/3] [nrf toup] Remove redundant nosys.specs The obsolete nosys.spec is no more needed with the new Zephyr version. Signed-off-by: Arkadiusz Balys --- config/nrfconnect/chip-module/CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/nrfconnect/chip-module/CMakeLists.txt b/config/nrfconnect/chip-module/CMakeLists.txt index f3c80f75e68..c5cd37a851a 100644 --- a/config/nrfconnect/chip-module/CMakeLists.txt +++ b/config/nrfconnect/chip-module/CMakeLists.txt @@ -61,10 +61,6 @@ if (CHIP_CFLAGS) matter_add_flags("${CHIP_CFLAGS}") endif() -if (CONFIG_ARM) - matter_add_cflags(--specs=nosys.specs) -endif() - if (CONFIG_NRF_SECURITY) zephyr_include_directories($) From 40ed3ab3244e548b6b62aaf45a4b22aa6eef3308 Mon Sep 17 00:00:00 2001 From: Arkadiusz Balys Date: Mon, 27 Apr 2026 11:00:54 +0200 Subject: [PATCH 3/3] [nrf toup] Normalize Zephyr compile flags before exporting to GN Normalize Zephyr compile flags before exporting them to Matter GN args by rewriting `$` to `$`. This avoids CMake generate-time failures in `file(GENERATE)` after recent Zephyr LTO/KERNEL_NO_LTO changes. Signed-off-by: Arkadiusz Balys --- config/nrfconnect/chip-module/CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/nrfconnect/chip-module/CMakeLists.txt b/config/nrfconnect/chip-module/CMakeLists.txt index c5cd37a851a..f28f9887d82 100644 --- a/config/nrfconnect/chip-module/CMakeLists.txt +++ b/config/nrfconnect/chip-module/CMakeLists.txt @@ -92,8 +92,15 @@ if (CONFIG_CHIP_LOG_FILE_NAME) endif() zephyr_get_compile_flags(ZEPHYR_CFLAGS_C C) + +# Zephyr may emit unqualified TARGET_PROPERTY genex (e.g. $) +# that cannot be evaluated by file(GENERATE) in matter_generate_args_tmp_file(). +set(ZEPHYR_CFLAGS_C "${ZEPHYR_CFLAGS_C}") +string(REPLACE "$" "$" ZEPHYR_CFLAGS_C "${ZEPHYR_CFLAGS_C}") matter_add_cflags("${ZEPHYR_CFLAGS_C}") zephyr_get_compile_flags(ZEPHYR_CFLAGS_CC CXX) +set(ZEPHYR_CFLAGS_CC "${ZEPHYR_CFLAGS_CC}") +string(REPLACE "$" "$" ZEPHYR_CFLAGS_CC "${ZEPHYR_CFLAGS_CC}") matter_add_cxxflags("${ZEPHYR_CFLAGS_CC}") zephyr_get_gnu_cpp_standard(ZEPHYR_GNU_CPP_STD) matter_add_cxxflags(${ZEPHYR_GNU_CPP_STD})