Skip to content

Commit ef46382

Browse files
committed
modules: tf-m: append PS_ROLLBACK_PROTECTION to TFM_CMAKE_OPTIONS
TF-M now propagates this CMake option as a compile definition. Pass to the build system the same value that we set in tfm_config.h, otherwise we end up with different redefinitions of PS_ROLLBACK_PROTECTION between the command line (CMake options) and the generated configuration header file. Signed-off-by: Tomi Fontanilles <[email protected]>
1 parent 755e983 commit ef46382

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

modules/trusted-firmware-m/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ set_property(TARGET zephyr_property_target
5959
-DPython3_EXECUTABLE=${Python3_EXECUTABLE}
6060
-DPROJECT_CONFIG_HEADER_FILE=${CMAKE_CURRENT_BINARY_DIR}/tfm_config.h
6161
-DTFM_EXTRA_CONFIG_PATH="${CMAKE_CURRENT_BINARY_DIR}/config_extra.cmake"
62+
-DPS_ROLLBACK_PROTECTION=${CONFIG_TFM_PS_ROLLBACK_PROTECTION}
6263
$<$<BOOL:mcuboot_single_slot>:-DNRF_NS_SECONDARY=OFF>
6364
$<$<NOT:$<BOOL:mcuboot_single_slot>>:-DNRF_NS_SECONDARY=ON>
6465
$<$<BOOL:${CONFIG_TFM_HW_INIT_RESET_ON_BOOT}>:-DNRF_HW_INIT_RESET_ON_BOOT=ON>

0 commit comments

Comments
 (0)