Skip to content

Commit

Permalink
[nrf noup] Update Mbed TLS config file defines
Browse files Browse the repository at this point in the history
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.

Signed-off-by: Vidar Lillebø <vidar.lillebo@nordicsemi.no>
  • Loading branch information
vili-nordic committed Feb 9, 2024
1 parent 4936f9f commit d76b08e
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions config/nrfconnect/chip-module/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ if (CONFIG_NRF_SECURITY)
endif()
matter_add_flags(-DMBEDTLS_CONFIG_FILE=<nrf-config.h>)
if(CONFIG_CHIP_CRYPTO_PSA)
matter_add_flags(-DMBEDTLS_USER_CONFIG_FILE=<nrf-config-user.h>)
matter_add_flags(-DMBEDTLS_PSA_CRYPTO_CONFIG_FILE=<nrf-psa-crypto-want-config.h>)
matter_add_flags(-DMBEDTLS_PSA_CRYPTO_USER_CONFIG_FILE=<nrf-psa-crypto-config.h>)
endif()
elseif(CONFIG_MBEDTLS)
zephyr_include_directories($<TARGET_PROPERTY:mbedTLS,INTERFACE_INCLUDE_DIRECTORIES>)
Expand All @@ -89,7 +90,7 @@ matter_add_cxxflags(${ZEPHYR_GNU_CPP_STD})
# Set up custom OpenThread configuration

if (CONFIG_CHIP_OPENTHREAD_CONFIG)
get_filename_component(CHIP_OPENTHREAD_CONFIG
get_filename_component(CHIP_OPENTHREAD_CONFIG
${CONFIG_CHIP_OPENTHREAD_CONFIG}
REALPATH
BASE_DIR ${CMAKE_SOURCE_DIR}
Expand Down

0 comments on commit d76b08e

Please sign in to comment.