Skip to content

Commit

Permalink
nrf_security: Re-run TF-M when zephyr configuration have changed
Browse files Browse the repository at this point in the history
This fixes the nrf-config-user.h header not being updated when
the zephyr configuration for crypto has changed.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
  • Loading branch information
joerchan authored and rlubos committed Jul 7, 2023
1 parent 4661d98 commit 347093e
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions subsys/nrf_security/tfm/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ endforeach()
# Standard extensions of Zephyr included in the TF-M build
list(APPEND CMAKE_MODULE_PATH ${ZEPHYR_BASE}/cmake/modules)
include(extensions)

# Force a re-run of TF-M configuration if zephyr configuration has changed.
# Since we import these configurations we need to re-run when they have changed.
set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${ZEPHYR_AUTOCONF})
set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${ZEPHYR_DOTCONFIG})

import_kconfig(CONFIG_ ${ZEPHYR_DOTCONFIG})

# Additional TF-M build only settings:
Expand Down

0 comments on commit 347093e

Please sign in to comment.