Skip to content

Commit 40fb5ad

Browse files
vlilleboecarlescufi
authored andcommitted
[nrf noup] Update Mbed TLS config file defines
MBEDTLS_USER_CONFIG_FILE has been replaced with MBEDTLS_PSA_CRYPTO_CONFIG_FILE and MBEDTLS_PSA_CRYPTO_USER_CONFIG_FILE. This commit updates Matter's CMakeLists to reflect this. Also some legacy APIs are provided by PSA now, so we always propagate PSA config files. Signed-off-by: Vidar Lillebø <vidar.lillebo@nordicsemi.no>
1 parent 1fa4e7c commit 40fb5ad

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

config/nrfconnect/chip-module/CMakeLists.txt

+3-4
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,8 @@ if (CONFIG_NRF_SECURITY)
6767
zephyr_include_directories($<TARGET_PROPERTY:platform_cc3xx,INTERFACE_INCLUDE_DIRECTORIES>)
6868
endif()
6969
matter_add_flags(-DMBEDTLS_CONFIG_FILE=<nrf-config.h>)
70-
if(CONFIG_CHIP_CRYPTO_PSA)
71-
matter_add_flags(-DMBEDTLS_USER_CONFIG_FILE=<nrf-config-user.h>)
72-
endif()
70+
matter_add_flags(-DMBEDTLS_PSA_CRYPTO_CONFIG_FILE=<nrf-psa-crypto-want-config.h>)
71+
matter_add_flags(-DMBEDTLS_PSA_CRYPTO_USER_CONFIG_FILE=<nrf-psa-crypto-config.h>)
7372
elseif(CONFIG_MBEDTLS)
7473
zephyr_include_directories($<TARGET_PROPERTY:mbedTLS,INTERFACE_INCLUDE_DIRECTORIES>)
7574
zephyr_compile_definitions($<TARGET_PROPERTY:mbedTLS,INTERFACE_COMPILE_DEFINITIONS>)
@@ -89,7 +88,7 @@ matter_add_cxxflags(${ZEPHYR_GNU_CPP_STD})
8988
# Set up custom OpenThread configuration
9089

9190
if (CONFIG_CHIP_OPENTHREAD_CONFIG)
92-
get_filename_component(CHIP_OPENTHREAD_CONFIG
91+
get_filename_component(CHIP_OPENTHREAD_CONFIG
9392
${CONFIG_CHIP_OPENTHREAD_CONFIG}
9493
REALPATH
9594
BASE_DIR ${CMAKE_SOURCE_DIR}

0 commit comments

Comments
 (0)