modules: tf-m: Fix mcuboot_single_image bug

The cmake logic which checks the mcuboot_single_image
in order to enable the NRF_NS_SECONDARY variable is wrong
since it evaluates the actual mcuboot_single_image
string and not the variable. As a result the boolean
check is always true and thus the NRF_NS_SECONDARY
is never enabled. Fix the check to use the variable
and not the literal string.

Signed-off-by: Georgios Vasilakis <[email protected]>

Author: Vge0rge

modules/trusted-firmware-m/CMakeLists.txt

@@ -60,8 +60,7 @@ set_property(TARGET zephyr_property_target
   -DPROJECT_CONFIG_HEADER_FILE=${CMAKE_CURRENT_BINARY_DIR}/tfm_config.h
   -DTFM_EXTRA_CONFIG_PATH="${CMAKE_CURRENT_BINARY_DIR}/config_extra.cmake"
   -DPS_ROLLBACK_PROTECTION=${CONFIG_TFM_PS_ROLLBACK_PROTECTION}
-  $<$<BOOL:mcuboot_single_slot>:-DNRF_NS_SECONDARY=OFF>
-  $<$<NOT:$<BOOL:mcuboot_single_slot>>:-DNRF_NS_SECONDARY=ON>
+  $<$<AND:$<NOT:$<BOOL:${mcuboot_single_slot}>>,$<BOOL:${CONFIG_BOOTLOADER_MCUBOOT}>>:-DNRF_NS_SECONDARY=ON>
   $<$<BOOL:${CONFIG_TFM_HW_INIT_RESET_ON_BOOT}>:-DNRF_HW_INIT_RESET_ON_BOOT=ON>
   $<$<BOOL:${CONFIG_TFM_HW_INIT_NRF_PERIPHERALS}>:-DNRF_HW_INIT_NRF_PERIPHERALS=ON>
   $<$<BOOL:${CONFIG_TFM_ALLOW_NON_SECURE_RESET}>:-DNRF_ALLOW_NON_SECURE_RESET=ON>