aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoakim Andersson <joakim.andersson@nordicsemi.no>2023-02-02 15:49:19 +0100
committerDavid Hu <david.hu@arm.com>2023-02-07 03:17:28 +0100
commit10de90eaf12e8daded116b07bd777437716ec7cb (patch)
tree2bd9dd66740638adb500a8159105b6119dacfc42
parent16869c4043396f075cf116d97807e25c57868740 (diff)
downloadtrusted-firmware-m-10de90eaf12e8daded116b07bd777437716ec7cb.tar.gz
platform: common: Move TFM vector out of ifdef for trustzone
Move the TFM vector specific parts out of the ifdef for trustzone containing the placement of the veneers. These are not the same vector tables. Change-Id: I354392fd7e4e830500ae7748d23341c2806bdbc9 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
-rw-r--r--platform/ext/common/gcc/tfm_common_s.ld3
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/ext/common/gcc/tfm_common_s.ld b/platform/ext/common/gcc/tfm_common_s.ld
index 4ed47b9f64..70f8991eef 100644
--- a/platform/ext/common/gcc/tfm_common_s.ld
+++ b/platform/ext/common/gcc/tfm_common_s.ld
@@ -55,9 +55,10 @@ SECTIONS
__vectors_end__ = .;
} > FLASH
-#ifdef CONFIG_TFM_USE_TRUSTZONE
ASSERT(. <= ADDR(.TFM_VECTORS) + S_CODE_VECTOR_TABLE_SIZE, ".TFM_VECTORS section size overflow.")
. = ADDR(.TFM_VECTORS) + S_CODE_VECTOR_TABLE_SIZE;
+
+#ifdef CONFIG_TFM_USE_TRUSTZONE
/*
* Place the CMSE Veneers (containing the SG instruction) after the code, in
* a separate at least 32 bytes aligned region so that the SAU can