commit e5cadb28ca650c16976bcf095d7259bc9717dbcc
author Balint Matyi <Balint.Matyi@arm.com> Mon Jul 06 14:43:37 2020 +0100
committer Tamas Ban <tamas.ban@arm.com> Wed Sep 30 08:07:38 2020 +0000
tree 4715acacfffd0d1639d2f0faf15b98fe9d5fdf46
parent 0bd0dfce05d12d1bf51f714de606bb56f159b3ad

Attest: Remove LEGACY_TFM_TLV_HEADER support

The boot record is shared between bootloader and
runtime firmware in the structure of TLV data.
The header of the TLV fields are filled differently
by original MCUboot and its TF-M fork. The config
option LEGACY_TFM_TLV_HEADER was meant to make the
distinction. Since the forked version of MCUboot is
going to be removed therefore this differentiation
could also be deleted.

Signed-off-by: Balint Matyi <Balint.Matyi@arm.com>
Change-Id: Ie3904996eb0f1006eaa67c324dfbbb21a9e146ab

secure_fw/spm/common/tfm_boot_data.c

diff --git a/secure_fw/spm/common/tfm_boot_data.c b/secure_fw/spm/common/tfm_boot_data.c
index 901d43e..fe77002 100644
--- a/secure_fw/spm/common/tfm_boot_data.c
+++ b/secure_fw/spm/common/tfm_boot_data.c
@@ -220,11 +220,9 @@
         /* Create local copy to avoid unaligned access */
         (void)spm_memcpy(&tlv_entry, (const void *)offset,
                          SHARED_DATA_ENTRY_HEADER_SIZE);
-#ifdef LEGACY_TFM_TLV_HEADER
-        next_tlv_offset = tlv_entry.tlv_len;
-#else
+
         next_tlv_offset = SHARED_DATA_ENTRY_HEADER_SIZE + tlv_entry.tlv_len;
-#endif
+
         if (GET_MAJOR(tlv_entry.tlv_type) == tlv_major) {
             /* Check buffer overflow */
             if (((ptr - buf_start) + next_tlv_offset) > buf_size) {