tfm: Kconfig: Configure MCUBOOT_DATA_SHARING explicitly

Previously, MCUBOOT_DATA_SHARING was enabled when BL2 was built
and when the firmware update partition was present. This is not
the only situation that you might be interested in this data
sharing. The data sharing now has it's own Kconfig.

Further, use of the firmware update partition requires data
sharing, so it selects it.

Signed-off-by: Jimmy Brisson <[email protected]>

Author: theotherjimmy

modules/trusted-firmware-m/CMakeLists.txt

@@ -227,7 +227,7 @@ if (CONFIG_BUILD_WITH_TFM)
     list(APPEND TFM_CMAKE_ARGS -DMCUBOOT_PATH=${ZEPHYR_MCUBOOT_MODULE_DIR})
   endif()
 
-  if(CONFIG_TFM_BL2 AND CONFIG_TFM_PARTITION_FIRMWARE_UPDATE)
+  if(CONFIG_TFM_MCUBOOT_DATA_SHARING)
     list(APPEND TFM_CMAKE_ARGS -DMCUBOOT_DATA_SHARING=ON)
   endif()
 

modules/trusted-firmware-m/Kconfig.tfm

@@ -234,6 +234,12 @@ config TFM_MCUBOOT_PATH_DOWNLOAD
 
 endchoice
 
+config TFM_MCUBOOT_DATA_SHARING
+	bool "Share app-specific data between TF-M and MCUBoot"
+	help
+	  Add sharing of application specific data using the same
+	  shared data area as for the measured boot.
+
 endif # TFM_BL2
 
 config TFM_IPC

modules/trusted-firmware-m/Kconfig.tfm.partitions

@@ -76,6 +76,7 @@ config TFM_PARTITION_AUDIT_LOG
 
 config TFM_PARTITION_FIRMWARE_UPDATE
 	bool "Include the secure parition 'Firmware Update'"
+	select TFM_MCUBOOT_DATA_SHARING
 	default n
 	help
 	  Setting this option will cause '-DTFM_PARTITION_FIRMWARE_UPDATE'