Skip to content

upmerge 2026.03.25 #714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anangl merged 3 commits into from
Apr 30, 2026
Merged

upmerge 2026.03.25 #714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06301c5
[nrf toup] rename CONFIG_MBEDTLS_CFG_FILE
tomi-font Apr 13, 2026
89bfdc3
[nrf toup] Remove redundant nosys.specs
ArekBalysNordic Apr 23, 2026
40ed3ab
[nrf toup] Normalize Zephyr compile flags before exporting to GN
ArekBalysNordic Apr 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions config/nrfconnect/chip-module/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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($<TARGET_PROPERTY:mbedtls_external,INTERFACE_INCLUDE_DIRECTORIES>)

Expand Down Expand Up @@ -96,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. $<TARGET_PROPERTY:LTO>)
# that cannot be evaluated by file(GENERATE) in matter_generate_args_tmp_file().
set(ZEPHYR_CFLAGS_C "${ZEPHYR_CFLAGS_C}")
string(REPLACE "$<TARGET_PROPERTY:LTO>" "$<TARGET_PROPERTY:zephyr_interface,LTO>" 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 "$<TARGET_PROPERTY:LTO>" "$<TARGET_PROPERTY:zephyr_interface,LTO>" 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})
Expand Down
2 changes: 1 addition & 1 deletion config/nxp/chip-module/Kconfig.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/telink/chip-module/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion examples/all-clusters-minimal-app/nrfconnect/sysbuild/mcuboot/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/pump-app/nrfconnect/sysbuild/mcuboot/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/pump-controller-app/nrfconnect/sysbuild/mcuboot/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading