Build: Merge tfm_partition_defs into tfm_config
CMake target tfm_partition_defs is merged into tfm_config. Same change
is also needed in tf-m-extras.
Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: I3f30b5d3d5947d79afb8a7085f318a8ed5c64804
diff --git a/examples/corstone310_fvp_dma/dma350_ns/CMakeLists.txt b/examples/corstone310_fvp_dma/dma350_ns/CMakeLists.txt
index 6dcf5bf..425083c 100644
--- a/examples/corstone310_fvp_dma/dma350_ns/CMakeLists.txt
+++ b/examples/corstone310_fvp_dma/dma350_ns/CMakeLists.txt
@@ -38,7 +38,7 @@
# It can be replaced by NS side configurations later.
target_link_libraries(tfm_ns_interface
INTERFACE
- tfm_partition_defs
+ tfm_config
)
############################# TFM NS app #######################################
diff --git a/examples/corstone310_fvp_dma/triggering_example/CMakeLists.txt b/examples/corstone310_fvp_dma/triggering_example/CMakeLists.txt
index d919a5b..2d523f9 100644
--- a/examples/corstone310_fvp_dma/triggering_example/CMakeLists.txt
+++ b/examples/corstone310_fvp_dma/triggering_example/CMakeLists.txt
@@ -26,7 +26,7 @@
# It can be replaced by NS side configurations later.
target_link_libraries(tfm_ns_interface
INTERFACE
- tfm_partition_defs
+ tfm_config
)
############################# TFM NS app #######################################
diff --git a/examples/example_partition/CMakeLists.txt b/examples/example_partition/CMakeLists.txt
index 34130f3..cb31de6 100644
--- a/examples/example_partition/CMakeLists.txt
+++ b/examples/example_partition/CMakeLists.txt
@@ -67,7 +67,7 @@
tfm_app_rot_partition_example
)
-target_compile_definitions(tfm_partition_defs
+target_compile_definitions(tfm_config
INTERFACE
TFM_PARTITION_EXAMPLE
)
diff --git a/examples/vad_an552/ns_side/CMakeLists.txt b/examples/vad_an552/ns_side/CMakeLists.txt
index a517a34..bab8ca3 100644
--- a/examples/vad_an552/ns_side/CMakeLists.txt
+++ b/examples/vad_an552/ns_side/CMakeLists.txt
@@ -46,7 +46,7 @@
# It can be replaced by NS side configurations later.
target_link_libraries(tfm_ns_interface
INTERFACE
- tfm_partition_defs
+ tfm_config
)
############################# TFM NS app #######################################
diff --git a/partitions/delegated_attestation/CMakeLists.txt b/partitions/delegated_attestation/CMakeLists.txt
index 2d78ff4..7cb47b4 100644
--- a/partitions/delegated_attestation/CMakeLists.txt
+++ b/partitions/delegated_attestation/CMakeLists.txt
@@ -90,7 +90,7 @@
tfm_app_rot_partition_delegated_attest
)
-target_compile_definitions(tfm_partition_defs
+target_compile_definitions(tfm_config
INTERFACE
TFM_PARTITION_DELEGATED_ATTESTATION
)
diff --git a/partitions/external_trusted_secure_storage/etss_partition/CMakeLists.txt b/partitions/external_trusted_secure_storage/etss_partition/CMakeLists.txt
index d2d91c2..4dfb57e 100644
--- a/partitions/external_trusted_secure_storage/etss_partition/CMakeLists.txt
+++ b/partitions/external_trusted_secure_storage/etss_partition/CMakeLists.txt
@@ -97,7 +97,7 @@
tfm_psa_rot_partition_etss
)
-target_compile_definitions(tfm_partition_defs
+target_compile_definitions(tfm_config
INTERFACE
TFM_PARTITION_EXTERNAL_TRUSTED_SECURE_STORAGE
)
diff --git a/partitions/measured_boot/CMakeLists.txt b/partitions/measured_boot/CMakeLists.txt
index 0f37532..0bd3220 100644
--- a/partitions/measured_boot/CMakeLists.txt
+++ b/partitions/measured_boot/CMakeLists.txt
@@ -105,7 +105,7 @@
tfm_psa_rot_partition_measured_boot
)
-target_compile_definitions(tfm_partition_defs
+target_compile_definitions(tfm_config
INTERFACE
TFM_PARTITION_MEASURED_BOOT
MEASUREMENT_HASH_ALGO_NAME="${MEASUREMENT_HASH_ALGO_NAME}"