modules: tf-m: Refactor cmake logic

Refactor the cmake logic for a couple of options
in TF-M.

This remove the generator expressions for the mcuboot
single image option and adds them in an existing if
statement as they used to be before the upmerge.

Do the same for the hw init nrf peripherals option as well.

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

Author: Vge0rge

modules/trusted-firmware-m/CMakeLists.txt

@@ -40,6 +40,25 @@ if(CONFIG_BOOTLOADER_MCUBOOT AND NOT CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY)
 
   set(mcuboot_single_slot)
   mcuboot_single_check(mcuboot_single_slot)
+
+  if(${mcuboot_single_slot})
+    set_property(TARGET zephyr_property_target
+      APPEND PROPERTY TFM_CMAKE_OPTIONS
+      -DNRF_NS_SECONDARY=n
+    )
+  else()
+    set_property(TARGET zephyr_property_target
+      APPEND PROPERTY TFM_CMAKE_OPTIONS
+      -DNRF_NS_SECONDARY=y
+    )
+  endif()
+endif()
+
+if(CONFIG_TFM_HW_INIT_RESET_ON_BOOT AND CONFIG_TFM_HW_INIT_NRF_PERIPHERALS)
+    set_property(TARGET zephyr_property_target
+      APPEND PROPERTY TFM_CMAKE_OPTIONS
+      -DNRF_HW_INIT_NRF_PERIPHERALS=ON
+    )
 endif()
 
 set_property(TARGET zephyr_property_target
@@ -60,9 +79,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}
-  $<$<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>
   $<$<BOOL:${CONFIG_TFM_SECURE_UART0}>:-DNRF_SECURE_UART_INSTANCE=0>
   $<$<BOOL:${CONFIG_TFM_SECURE_UART1}>:-DNRF_SECURE_UART_INSTANCE=1>
@@ -86,7 +103,6 @@ set_property(TARGET zephyr_property_target
   $<$<BOOL:${CONFIG_NRF_SECURE_APPROTECT_USER_HANDLING}>:-DCONFIG_NRF_SECURE_APPROTECT_USER_HANDLING=ON>
   $<$<BOOL:${CONFIG_IDENTITY_KEY_TFM}>:-DCONFIG_IDENTITY_KEY_TFM=ON>
   $<$<BOOL:${CONFIG_TFM_PS_SUPPORT_FORMAT_TRANSITION}>:-DPS_SUPPORT_FORMAT_TRANSITION=ON>
-
 )
 
 if(CONFIG_TFM_PROFILE_TYPE_MINIMAL)