Build: Add dependencies for the manifest tool
This patch adds dependencies for the manifest tool so that any change on
the files the manifest tool consumes will trigger the manifest tool to
re-run thus make the changes take effect.
This patch also removes the unnecessary link to psa_interface as it has
been publicly linked by tfm_sprt.
Signed-off-by: Kevin Peng <kevin.peng@arm.com>
Change-Id: I3170a86e50dfdc946f56ff451ae6fa1436e2aeae
diff --git a/examples/example_partition/CMakeLists.txt b/examples/example_partition/CMakeLists.txt
index cb31de6..20c6aa9 100644
--- a/examples/example_partition/CMakeLists.txt
+++ b/examples/example_partition/CMakeLists.txt
@@ -35,6 +35,9 @@
${CMAKE_BINARY_DIR}/generated/example_partition/auto_generated/load_info_tfm_example_partition.c
)
+# Add dependency to the manifest_tool
+add_dependencies(tfm_app_rot_partition_example manifest_tool)
+
target_include_directories(tfm_app_rot_partition_example
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}
@@ -44,7 +47,6 @@
target_link_libraries(tfm_app_rot_partition_example
PRIVATE
- psa_interface
tfm_sprt
)
diff --git a/partitions/delegated_attestation/CMakeLists.txt b/partitions/delegated_attestation/CMakeLists.txt
index 7cb47b4..1d541ab 100644
--- a/partitions/delegated_attestation/CMakeLists.txt
+++ b/partitions/delegated_attestation/CMakeLists.txt
@@ -40,6 +40,9 @@
${CMAKE_CURRENT_SOURCE_DIR}
)
+# Add dependency to the manifest_tool
+add_dependencies(tfm_app_rot_partition_delegated_attest manifest_tool)
+
target_compile_definitions(tfm_app_rot_partition_delegated_attest
PRIVATE
$<$<BOOL:${DELEG_ATTEST_DUMP_TOKEN_AND_KEY}>:DELEG_ATTEST_DUMP_TOKEN_AND_KEY>
@@ -48,7 +51,6 @@
target_link_libraries(tfm_app_rot_partition_delegated_attest
PRIVATE
platform_s
- psa_interface
tfm_sprt
tfm_attestation_defs
qcbor
diff --git a/partitions/dma350_unpriv_partition/CMakeLists.txt b/partitions/dma350_unpriv_partition/CMakeLists.txt
index a4718b0..1b2f8c1 100644
--- a/partitions/dma350_unpriv_partition/CMakeLists.txt
+++ b/partitions/dma350_unpriv_partition/CMakeLists.txt
@@ -28,6 +28,9 @@
${CMAKE_BINARY_DIR}/generated/auto_generated/load_info_tfm_dma350_example_partition.c
)
+# Add dependency to the manifest_tool
+add_dependencies(tfm_app_rot_partition_dma350_unpriv manifest_tool)
+
target_include_directories(tfm_app_rot_partition_dma350_unpriv
PRIVATE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
@@ -38,7 +41,6 @@
target_link_libraries(tfm_app_rot_partition_dma350_unpriv
PRIVATE
- psa_interface
platform_s
tfm_sprt
)
diff --git a/partitions/measured_boot/CMakeLists.txt b/partitions/measured_boot/CMakeLists.txt
index 0bd3220..1964035 100644
--- a/partitions/measured_boot/CMakeLists.txt
+++ b/partitions/measured_boot/CMakeLists.txt
@@ -34,6 +34,9 @@
${CMAKE_BINARY_DIR}/generated/secure_fw/partitions/measured_boot/auto_generated/load_info_tfm_measured_boot.c
)
+# Add dependency to the manifest_tool
+add_dependencies(tfm_psa_rot_partition_measured_boot manifest_tool)
+
# Set include directory
target_include_directories(tfm_psa_rot_partition_measured_boot
PRIVATE
@@ -42,10 +45,8 @@
${CMAKE_BINARY_DIR}/generated/secure_fw/partitions/measured_boot
)
-
target_link_libraries(tfm_psa_rot_partition_measured_boot
PRIVATE
- psa_interface
platform_s
tfm_sprt
)
diff --git a/partitions/vad_an552_sp/CMakeLists.txt b/partitions/vad_an552_sp/CMakeLists.txt
index 63433e3..e6fb007 100644
--- a/partitions/vad_an552_sp/CMakeLists.txt
+++ b/partitions/vad_an552_sp/CMakeLists.txt
@@ -91,9 +91,11 @@
${CMAKE_BINARY_DIR}/generated/auto_generated/load_info_vad_an552_sp.c
)
+# Add dependency to the manifest_tool
+add_dependencies(tfm_app_rot_partition_vad_an552 manifest_tool)
+
target_link_libraries(tfm_app_rot_partition_vad_an552
PRIVATE
- psa_interface
platform_s
tfm_sprt
)