commit 5fb7a1352fdd9b797fb98b755caa7f21d5907e42
author Jamie Fox <jamie.fox@arm.com> Mon Aug 01 17:26:03 2022 +0100
committer David Hu <david.hu@arm.com> Tue Aug 02 06:59:15 2022 +0200
tree c7ba6fc8743e789346164a43b255667e2715ed05
parent cfbfd0ec64662422288f9e455349d3eb12d0e5d4

Measured boot: Rename build variable

The TFM_BOOT_STORE_MEASUREMENTS build variable was renamed after the
measured boot partition was merged. This commit updates the name.

Signed-off-by: Jamie Fox <jamie.fox@arm.com>
Change-Id: I280f339e1b78f585ed687074c9b2172b7c2093c1

partitions/measured_boot/CMakeLists.txt

diff --git a/partitions/measured_boot/CMakeLists.txt b/partitions/measured_boot/CMakeLists.txt
index 5cb1638..9bb9147 100644
--- a/partitions/measured_boot/CMakeLists.txt
+++ b/partitions/measured_boot/CMakeLists.txt
@@ -64,7 +64,7 @@
     PUBLIC
         TFM_MEASURED_BOOT_HASH_ALG=${MEASURED_BOOT_HASH_ALG}
         MEASUREMENT_VALUE_SIZE=${MEASUREMENT_VALUE_SIZE}
-        $<$<BOOL:${TFM_BOOT_STORE_MEASUREMENTS}>:TFM_BOOT_STORE_MEASUREMENTS>
+        $<$<BOOL:${CONFIG_TFM_BOOT_STORE_MEASUREMENTS}>:CONFIG_TFM_BOOT_STORE_MEASUREMENTS>
 )
 
 ############################ Secure API ########################################

partitions/measured_boot/measured_boot.c

diff --git a/partitions/measured_boot/measured_boot.c b/partitions/measured_boot/measured_boot.c
index 7fd1a52..2a1b13f 100644
--- a/partitions/measured_boot/measured_boot.c
+++ b/partitions/measured_boot/measured_boot.c
@@ -21,7 +21,7 @@
 
 #define TEMP_BUFFER_SIZE (MEASUREMENT_VALUE_SIZE + MEASUREMENT_VALUE_MAX_SIZE)
 
-#ifdef TFM_BOOT_STORE_MEASUREMENTS
+#ifdef CONFIG_TFM_BOOT_STORE_MEASUREMENTS
 /* Size of 1 complete measurement (value + metadata) in TLV format. */
 #define SHARED_BOOT_MEASUREMENT_SIZE                                           \
                             ((2 * SHARED_DATA_ENTRY_HEADER_SIZE)               \
@@ -57,7 +57,7 @@
  */
 __attribute__ ((aligned(4)))
 static struct boot_measurement_data boot_measurements;
-#endif /* TFM_BOOT_STORE_MEASUREMENTS */
+#endif /* CONFIG_TFM_BOOT_STORE_MEASUREMENTS */
 
 struct measurement_metadata_t {
     uint8_t  signer_id[SIGNER_ID_MAX_SIZE];
@@ -388,7 +388,7 @@
     }
 }
 
-#ifdef TFM_BOOT_STORE_MEASUREMENTS
+#ifdef CONFIG_TFM_BOOT_STORE_MEASUREMENTS
 psa_status_t collect_shared_measurements(void)
 {
     struct shared_data_tlv_entry tlv_entry;
@@ -478,4 +478,4 @@
 
     return status;
 }
-#endif /* TFM_BOOT_STORE_MEASUREMENTS */
+#endif /* CONFIG_TFM_BOOT_STORE_MEASUREMENTS */

partitions/measured_boot/measured_boot_req_mngr.c

diff --git a/partitions/measured_boot/measured_boot_req_mngr.c b/partitions/measured_boot/measured_boot_req_mngr.c
index 8590d69..c248136 100644
--- a/partitions/measured_boot/measured_boot_req_mngr.c
+++ b/partitions/measured_boot/measured_boot_req_mngr.c
@@ -195,7 +195,7 @@
     LOG_DBGFMT("Measured Boot : selected algorithm: %x\r\n",
                TFM_MEASURED_BOOT_HASH_ALG);
 
-#ifdef TFM_BOOT_STORE_MEASUREMENTS
+#ifdef CONFIG_TFM_BOOT_STORE_MEASUREMENTS
     status = collect_shared_measurements();
 #endif