aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Brand <chris.brand@cypress.com>2019-07-10 12:02:50 -0700
committerDavid Hu <david.hu@arm.com>2019-07-11 09:43:40 +0000
commitdd7d1c9b9cdaa941ba67d4efeb7407ead3032e26 (patch)
tree81cb62e930af3e803cb9d6392c3d7e3f57e852c5
parent81830c2ee7898529b96dccbaf96df4fdf7af318e (diff)
downloadtrusted-firmware-m-dd7d1c9b9cdaa941ba67d4efeb7407ead3032e26.tar.gz
Twincpu: Add updated common linker scatter file
Commit 4ca5c66e26aa86486fb514db00858766cce24996 ("Twincpu: Add preprocessor option and configuration TFM_MULTI_CORE_TOPOLOGY") updated the file platform/ext/common/armclang/tfm_common_s.sct.template but did not include the updated generated file, which is also under source control for some reason. As the actual scatter file is not generated as part of the build, this forces the user to manually re-generate it before building. Rectify that omission. Change-Id: Ia06c9926ea8a54a8693deaab63c5ac73ea33f3a0 Signed-off-by: Chris Brand <chris.brand@cypress.com>
-rw-r--r--platform/ext/common/armclang/tfm_common_s.sct2
1 files changed, 2 insertions, 0 deletions
diff --git a/platform/ext/common/armclang/tfm_common_s.sct b/platform/ext/common/armclang/tfm_common_s.sct
index 318481dd28..73c5169ea0 100644
--- a/platform/ext/common/armclang/tfm_common_s.sct
+++ b/platform/ext/common/armclang/tfm_common_s.sct
@@ -342,6 +342,7 @@ LR_CODE S_CODE_START {
ScatterAssert(ImageLimit(SRAM_WATERMARK) <= S_DATA_START + S_DATA_SIZE)
}
+#if !TFM_MULTI_CORE_TOPOLOGY
LR_VENEER CMSE_VENEER_REGION_START {
/*
* Place the CMSE Veneers (containing the SG instruction) in a separate
@@ -352,6 +353,7 @@ LR_VENEER CMSE_VENEER_REGION_START {
*(Veneer$$CMSE)
}
}
+#endif
LR_NS_PARTITION NS_PARTITION_START {
/* Reserved place for NS application.