Core: Enhance manifest to align with PSA
Below enhancements need to be applied to follow PSA:
- IPC related parameters added in manifest file (such as signal, sid,
minor_version and minor_policy).
- IPC service partition manifest file added to generate secure partion
source.
- Remove "tfm_partition_name" from manifest file and use "name"
directly.
- Remove IPC unused template: tfm_sfid_list.inc.template
Note:
- Signal header also need to be added manually by hardcode for tool
cannot support it now.
Change-Id: I47c2c4058e99a0b278c7b05b1e8d80058bc185a1
Signed-off-by: Edison Ai <edison.ai@arm.com>
diff --git a/platform/ext/target/mps2/an519/gcc/mps2_an519_s.ld.template b/platform/ext/target/mps2/an519/gcc/mps2_an519_s.ld.template
index 1eb1e65..dbaea18 100644
--- a/platform/ext/target/mps2/an519/gcc/mps2_an519_s.ld.template
+++ b/platform/ext/target/mps2/an519/gcc/mps2_an519_s.ld.template
@@ -95,9 +95,9 @@
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#ifdef @@attr.conditional@@
@!GENERATOR_CONDITIONAL_END!@
- LONG (LOADADDR(.@@manifest.tfm_partition_name@@_DATA))
- LONG (ADDR(.@@manifest.tfm_partition_name@@_DATA))
- LONG (SIZEOF(.@@manifest.tfm_partition_name@@_DATA))
+ LONG (LOADADDR(.@@manifest.name@@_DATA))
+ LONG (ADDR(.@@manifest.name@@_DATA))
+ LONG (SIZEOF(.@@manifest.name@@_DATA))
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#endif /* @@attr.conditional@@ */
@!GENERATOR_CONDITIONAL_END!@
@@ -116,10 +116,10 @@
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#ifdef @@attr.conditional@@
@!GENERATOR_CONDITIONAL_END!@
- LONG (ADDR(.@@manifest.tfm_partition_name@@_BSS))
- LONG (SIZEOF(.@@manifest.tfm_partition_name@@_BSS))
- LONG (ADDR(.@@manifest.tfm_partition_name@@_STACK))
- LONG (SIZEOF(.@@manifest.tfm_partition_name@@_STACK))
+ LONG (ADDR(.@@manifest.name@@_BSS))
+ LONG (SIZEOF(.@@manifest.name@@_BSS))
+ LONG (ADDR(.@@manifest.name@@_STACK))
+ LONG (SIZEOF(.@@manifest.name@@_STACK))
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#endif /* @@attr.conditional@@ */
@!GENERATOR_CONDITIONAL_END!@
@@ -157,7 +157,7 @@
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#ifdef @@attr.conditional@@
@!GENERATOR_CONDITIONAL_END!@
- .@@manifest.tfm_partition_name@@ : ALIGN(32)
+ .@@manifest.name@@ : ALIGN(32)
{
@!GENERATOR_CONDITIONAL_START!@ @@manifest.tfm_linker_pattern.library_list@@
@@manifest.tfm_linker_pattern.library_list@@:*(.text*)
@@ -167,13 +167,13 @@
@@manifest.tfm_linker_pattern.object_list@@(.text*)
@@manifest.tfm_linker_pattern.object_list@@(.rodata*)
@!GENERATOR_CONDITIONAL_END!@
- *(@@manifest.tfm_partition_name@@_ATTR_FN)
+ *(@@manifest.name@@_ATTR_FN)
. = ALIGN(32);
} > FLASH
- Image$$@@manifest.tfm_partition_name@@$$RO$$Base = ADDR(.@@manifest.tfm_partition_name@@);
- Image$$@@manifest.tfm_partition_name@@$$RO$$Limit = ADDR(.@@manifest.tfm_partition_name@@) + SIZEOF(.@@manifest.tfm_partition_name@@);
- Image$$@@manifest.tfm_partition_name@@$$Base = ADDR(.@@manifest.tfm_partition_name@@);
- Image$$@@manifest.tfm_partition_name@@$$Limit = ADDR(.@@manifest.tfm_partition_name@@) + SIZEOF(.@@manifest.tfm_partition_name@@);
+ Image$$@@manifest.name@@$$RO$$Base = ADDR(.@@manifest.name@@);
+ Image$$@@manifest.name@@$$RO$$Limit = ADDR(.@@manifest.name@@) + SIZEOF(.@@manifest.name@@);
+ Image$$@@manifest.name@@$$Base = ADDR(.@@manifest.name@@);
+ Image$$@@manifest.name@@$$Limit = ADDR(.@@manifest.name@@) + SIZEOF(.@@manifest.name@@);
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#endif /* @@attr.conditional@@ */
@@ -312,7 +312,7 @@
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#ifdef @@attr.conditional@@
@!GENERATOR_CONDITIONAL_END!@
- .@@manifest.tfm_partition_name@@_DATA : ALIGN(32)
+ .@@manifest.name@@_DATA : ALIGN(32)
{
@!GENERATOR_CONDITIONAL_START!@ @@manifest.tfm_linker_pattern.library_list@@
@@manifest.tfm_linker_pattern.library_list@@:*(.data*)
@@ -322,10 +322,10 @@
@!GENERATOR_CONDITIONAL_END!@
. = ALIGN(32);
} > RAM AT> FLASH
- Image$$@@manifest.tfm_partition_name@@_DATA$$RW$$Base = ADDR(.@@manifest.tfm_partition_name@@_DATA);
- Image$$@@manifest.tfm_partition_name@@_DATA$$RW$$Limit = ADDR(.@@manifest.tfm_partition_name@@_DATA) + SIZEOF(.@@manifest.tfm_partition_name@@_DATA);
+ Image$$@@manifest.name@@_DATA$$RW$$Base = ADDR(.@@manifest.name@@_DATA);
+ Image$$@@manifest.name@@_DATA$$RW$$Limit = ADDR(.@@manifest.name@@_DATA) + SIZEOF(.@@manifest.name@@_DATA);
- .@@manifest.tfm_partition_name@@_BSS : ALIGN(32)
+ .@@manifest.name@@_BSS : ALIGN(32)
{
@!GENERATOR_CONDITIONAL_START!@ @@manifest.tfm_linker_pattern.library_list@@
@@manifest.tfm_linker_pattern.library_list@@:*(.bss*)
@@ -337,15 +337,15 @@
@!GENERATOR_CONDITIONAL_END!@
. = ALIGN(32);
} > RAM AT> FLASH
- Image$$@@manifest.tfm_partition_name@@_DATA$$ZI$$Base = ADDR(.@@manifest.tfm_partition_name@@_BSS);
- Image$$@@manifest.tfm_partition_name@@_DATA$$ZI$$Limit = ADDR(.@@manifest.tfm_partition_name@@_BSS) + SIZEOF(.@@manifest.tfm_partition_name@@_BSS);
+ Image$$@@manifest.name@@_DATA$$ZI$$Base = ADDR(.@@manifest.name@@_BSS);
+ Image$$@@manifest.name@@_DATA$$ZI$$Limit = ADDR(.@@manifest.name@@_BSS) + SIZEOF(.@@manifest.name@@_BSS);
- .@@manifest.tfm_partition_name@@_STACK : ALIGN(128)
+ .@@manifest.name@@_STACK : ALIGN(128)
{
. += @@manifest.stack_size@@;
} > RAM AT> FLASH
- Image$$@@manifest.tfm_partition_name@@_STACK$$ZI$$Base = ADDR(.@@manifest.tfm_partition_name@@_STACK);
- Image$$@@manifest.tfm_partition_name@@_STACK$$ZI$$Limit = ADDR(.@@manifest.tfm_partition_name@@_STACK) + SIZEOF(.@@manifest.tfm_partition_name@@_STACK);
+ Image$$@@manifest.name@@_STACK$$ZI$$Base = ADDR(.@@manifest.name@@_STACK);
+ Image$$@@manifest.name@@_STACK$$ZI$$Limit = ADDR(.@@manifest.name@@_STACK) + SIZEOF(.@@manifest.name@@_STACK);
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#endif /* @@attr.conditional@@ */
diff --git a/platform/ext/target/mps2/an521/gcc/mps2_an521_s.ld.template b/platform/ext/target/mps2/an521/gcc/mps2_an521_s.ld.template
index c971c6d..ede4b2b 100644
--- a/platform/ext/target/mps2/an521/gcc/mps2_an521_s.ld.template
+++ b/platform/ext/target/mps2/an521/gcc/mps2_an521_s.ld.template
@@ -95,9 +95,9 @@
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#ifdef @@attr.conditional@@
@!GENERATOR_CONDITIONAL_END!@
- LONG (LOADADDR(.@@manifest.tfm_partition_name@@_DATA))
- LONG (ADDR(.@@manifest.tfm_partition_name@@_DATA))
- LONG (SIZEOF(.@@manifest.tfm_partition_name@@_DATA))
+ LONG (LOADADDR(.@@manifest.name@@_DATA))
+ LONG (ADDR(.@@manifest.name@@_DATA))
+ LONG (SIZEOF(.@@manifest.name@@_DATA))
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#endif /* @@attr.conditional@@ */
@!GENERATOR_CONDITIONAL_END!@
@@ -116,10 +116,10 @@
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#ifdef @@attr.conditional@@
@!GENERATOR_CONDITIONAL_END!@
- LONG (ADDR(.@@manifest.tfm_partition_name@@_BSS))
- LONG (SIZEOF(.@@manifest.tfm_partition_name@@_BSS))
- LONG (ADDR(.@@manifest.tfm_partition_name@@_STACK))
- LONG (SIZEOF(.@@manifest.tfm_partition_name@@_STACK))
+ LONG (ADDR(.@@manifest.name@@_BSS))
+ LONG (SIZEOF(.@@manifest.name@@_BSS))
+ LONG (ADDR(.@@manifest.name@@_STACK))
+ LONG (SIZEOF(.@@manifest.name@@_STACK))
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#endif /* @@attr.conditional@@ */
@!GENERATOR_CONDITIONAL_END!@
@@ -157,7 +157,7 @@
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#ifdef @@attr.conditional@@
@!GENERATOR_CONDITIONAL_END!@
- .@@manifest.tfm_partition_name@@ : ALIGN(32)
+ .@@manifest.name@@ : ALIGN(32)
{
@!GENERATOR_CONDITIONAL_START!@ @@manifest.tfm_linker_pattern.library_list@@
@@manifest.tfm_linker_pattern.library_list@@:*(.text*)
@@ -167,13 +167,13 @@
@@manifest.tfm_linker_pattern.object_list@@(.text*)
@@manifest.tfm_linker_pattern.object_list@@(.rodata*)
@!GENERATOR_CONDITIONAL_END!@
- *(@@manifest.tfm_partition_name@@_ATTR_FN)
+ *(@@manifest.name@@_ATTR_FN)
. = ALIGN(32);
} > FLASH
- Image$$@@manifest.tfm_partition_name@@$$RO$$Base = ADDR(.@@manifest.tfm_partition_name@@);
- Image$$@@manifest.tfm_partition_name@@$$RO$$Limit = ADDR(.@@manifest.tfm_partition_name@@) + SIZEOF(.@@manifest.tfm_partition_name@@);
- Image$$@@manifest.tfm_partition_name@@$$Base = ADDR(.@@manifest.tfm_partition_name@@);
- Image$$@@manifest.tfm_partition_name@@$$Limit = ADDR(.@@manifest.tfm_partition_name@@) + SIZEOF(.@@manifest.tfm_partition_name@@);
+ Image$$@@manifest.name@@$$RO$$Base = ADDR(.@@manifest.name@@);
+ Image$$@@manifest.name@@$$RO$$Limit = ADDR(.@@manifest.name@@) + SIZEOF(.@@manifest.name@@);
+ Image$$@@manifest.name@@$$Base = ADDR(.@@manifest.name@@);
+ Image$$@@manifest.name@@$$Limit = ADDR(.@@manifest.name@@) + SIZEOF(.@@manifest.name@@);
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#endif /* @@attr.conditional@@ */
@@ -312,7 +312,7 @@
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#ifdef @@attr.conditional@@
@!GENERATOR_CONDITIONAL_END!@
- .@@manifest.tfm_partition_name@@_DATA : ALIGN(32)
+ .@@manifest.name@@_DATA : ALIGN(32)
{
@!GENERATOR_CONDITIONAL_START!@ @@manifest.tfm_linker_pattern.library_list@@
@@manifest.tfm_linker_pattern.library_list@@:*(.data*)
@@ -322,10 +322,10 @@
@!GENERATOR_CONDITIONAL_END!@
. = ALIGN(32);
} > RAM AT> FLASH
- Image$$@@manifest.tfm_partition_name@@_DATA$$RW$$Base = ADDR(.@@manifest.tfm_partition_name@@_DATA);
- Image$$@@manifest.tfm_partition_name@@_DATA$$RW$$Limit = ADDR(.@@manifest.tfm_partition_name@@_DATA) + SIZEOF(.@@manifest.tfm_partition_name@@_DATA);
+ Image$$@@manifest.name@@_DATA$$RW$$Base = ADDR(.@@manifest.name@@_DATA);
+ Image$$@@manifest.name@@_DATA$$RW$$Limit = ADDR(.@@manifest.name@@_DATA) + SIZEOF(.@@manifest.name@@_DATA);
- .@@manifest.tfm_partition_name@@_BSS : ALIGN(32)
+ .@@manifest.name@@_BSS : ALIGN(32)
{
@!GENERATOR_CONDITIONAL_START!@ @@manifest.tfm_linker_pattern.library_list@@
@@manifest.tfm_linker_pattern.library_list@@:*(.bss*)
@@ -337,15 +337,15 @@
@!GENERATOR_CONDITIONAL_END!@
. = ALIGN(32);
} > RAM AT> FLASH
- Image$$@@manifest.tfm_partition_name@@_DATA$$ZI$$Base = ADDR(.@@manifest.tfm_partition_name@@_BSS);
- Image$$@@manifest.tfm_partition_name@@_DATA$$ZI$$Limit = ADDR(.@@manifest.tfm_partition_name@@_BSS) + SIZEOF(.@@manifest.tfm_partition_name@@_BSS);
+ Image$$@@manifest.name@@_DATA$$ZI$$Base = ADDR(.@@manifest.name@@_BSS);
+ Image$$@@manifest.name@@_DATA$$ZI$$Limit = ADDR(.@@manifest.name@@_BSS) + SIZEOF(.@@manifest.name@@_BSS);
- .@@manifest.tfm_partition_name@@_STACK : ALIGN(128)
+ .@@manifest.name@@_STACK : ALIGN(128)
{
. += @@manifest.stack_size@@;
} > RAM AT> FLASH
- Image$$@@manifest.tfm_partition_name@@_STACK$$ZI$$Base = ADDR(.@@manifest.tfm_partition_name@@_STACK);
- Image$$@@manifest.tfm_partition_name@@_STACK$$ZI$$Limit = ADDR(.@@manifest.tfm_partition_name@@_STACK) + SIZEOF(.@@manifest.tfm_partition_name@@_STACK);
+ Image$$@@manifest.name@@_STACK$$ZI$$Base = ADDR(.@@manifest.name@@_STACK);
+ Image$$@@manifest.name@@_STACK$$ZI$$Limit = ADDR(.@@manifest.name@@_STACK) + SIZEOF(.@@manifest.name@@_STACK);
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#endif /* @@attr.conditional@@ */
diff --git a/platform/ext/target/musca_a/Device/Source/gcc/musca_s.ld.template b/platform/ext/target/musca_a/Device/Source/gcc/musca_s.ld.template
index 1eb1e65..dbaea18 100644
--- a/platform/ext/target/musca_a/Device/Source/gcc/musca_s.ld.template
+++ b/platform/ext/target/musca_a/Device/Source/gcc/musca_s.ld.template
@@ -95,9 +95,9 @@
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#ifdef @@attr.conditional@@
@!GENERATOR_CONDITIONAL_END!@
- LONG (LOADADDR(.@@manifest.tfm_partition_name@@_DATA))
- LONG (ADDR(.@@manifest.tfm_partition_name@@_DATA))
- LONG (SIZEOF(.@@manifest.tfm_partition_name@@_DATA))
+ LONG (LOADADDR(.@@manifest.name@@_DATA))
+ LONG (ADDR(.@@manifest.name@@_DATA))
+ LONG (SIZEOF(.@@manifest.name@@_DATA))
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#endif /* @@attr.conditional@@ */
@!GENERATOR_CONDITIONAL_END!@
@@ -116,10 +116,10 @@
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#ifdef @@attr.conditional@@
@!GENERATOR_CONDITIONAL_END!@
- LONG (ADDR(.@@manifest.tfm_partition_name@@_BSS))
- LONG (SIZEOF(.@@manifest.tfm_partition_name@@_BSS))
- LONG (ADDR(.@@manifest.tfm_partition_name@@_STACK))
- LONG (SIZEOF(.@@manifest.tfm_partition_name@@_STACK))
+ LONG (ADDR(.@@manifest.name@@_BSS))
+ LONG (SIZEOF(.@@manifest.name@@_BSS))
+ LONG (ADDR(.@@manifest.name@@_STACK))
+ LONG (SIZEOF(.@@manifest.name@@_STACK))
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#endif /* @@attr.conditional@@ */
@!GENERATOR_CONDITIONAL_END!@
@@ -157,7 +157,7 @@
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#ifdef @@attr.conditional@@
@!GENERATOR_CONDITIONAL_END!@
- .@@manifest.tfm_partition_name@@ : ALIGN(32)
+ .@@manifest.name@@ : ALIGN(32)
{
@!GENERATOR_CONDITIONAL_START!@ @@manifest.tfm_linker_pattern.library_list@@
@@manifest.tfm_linker_pattern.library_list@@:*(.text*)
@@ -167,13 +167,13 @@
@@manifest.tfm_linker_pattern.object_list@@(.text*)
@@manifest.tfm_linker_pattern.object_list@@(.rodata*)
@!GENERATOR_CONDITIONAL_END!@
- *(@@manifest.tfm_partition_name@@_ATTR_FN)
+ *(@@manifest.name@@_ATTR_FN)
. = ALIGN(32);
} > FLASH
- Image$$@@manifest.tfm_partition_name@@$$RO$$Base = ADDR(.@@manifest.tfm_partition_name@@);
- Image$$@@manifest.tfm_partition_name@@$$RO$$Limit = ADDR(.@@manifest.tfm_partition_name@@) + SIZEOF(.@@manifest.tfm_partition_name@@);
- Image$$@@manifest.tfm_partition_name@@$$Base = ADDR(.@@manifest.tfm_partition_name@@);
- Image$$@@manifest.tfm_partition_name@@$$Limit = ADDR(.@@manifest.tfm_partition_name@@) + SIZEOF(.@@manifest.tfm_partition_name@@);
+ Image$$@@manifest.name@@$$RO$$Base = ADDR(.@@manifest.name@@);
+ Image$$@@manifest.name@@$$RO$$Limit = ADDR(.@@manifest.name@@) + SIZEOF(.@@manifest.name@@);
+ Image$$@@manifest.name@@$$Base = ADDR(.@@manifest.name@@);
+ Image$$@@manifest.name@@$$Limit = ADDR(.@@manifest.name@@) + SIZEOF(.@@manifest.name@@);
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#endif /* @@attr.conditional@@ */
@@ -312,7 +312,7 @@
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#ifdef @@attr.conditional@@
@!GENERATOR_CONDITIONAL_END!@
- .@@manifest.tfm_partition_name@@_DATA : ALIGN(32)
+ .@@manifest.name@@_DATA : ALIGN(32)
{
@!GENERATOR_CONDITIONAL_START!@ @@manifest.tfm_linker_pattern.library_list@@
@@manifest.tfm_linker_pattern.library_list@@:*(.data*)
@@ -322,10 +322,10 @@
@!GENERATOR_CONDITIONAL_END!@
. = ALIGN(32);
} > RAM AT> FLASH
- Image$$@@manifest.tfm_partition_name@@_DATA$$RW$$Base = ADDR(.@@manifest.tfm_partition_name@@_DATA);
- Image$$@@manifest.tfm_partition_name@@_DATA$$RW$$Limit = ADDR(.@@manifest.tfm_partition_name@@_DATA) + SIZEOF(.@@manifest.tfm_partition_name@@_DATA);
+ Image$$@@manifest.name@@_DATA$$RW$$Base = ADDR(.@@manifest.name@@_DATA);
+ Image$$@@manifest.name@@_DATA$$RW$$Limit = ADDR(.@@manifest.name@@_DATA) + SIZEOF(.@@manifest.name@@_DATA);
- .@@manifest.tfm_partition_name@@_BSS : ALIGN(32)
+ .@@manifest.name@@_BSS : ALIGN(32)
{
@!GENERATOR_CONDITIONAL_START!@ @@manifest.tfm_linker_pattern.library_list@@
@@manifest.tfm_linker_pattern.library_list@@:*(.bss*)
@@ -337,15 +337,15 @@
@!GENERATOR_CONDITIONAL_END!@
. = ALIGN(32);
} > RAM AT> FLASH
- Image$$@@manifest.tfm_partition_name@@_DATA$$ZI$$Base = ADDR(.@@manifest.tfm_partition_name@@_BSS);
- Image$$@@manifest.tfm_partition_name@@_DATA$$ZI$$Limit = ADDR(.@@manifest.tfm_partition_name@@_BSS) + SIZEOF(.@@manifest.tfm_partition_name@@_BSS);
+ Image$$@@manifest.name@@_DATA$$ZI$$Base = ADDR(.@@manifest.name@@_BSS);
+ Image$$@@manifest.name@@_DATA$$ZI$$Limit = ADDR(.@@manifest.name@@_BSS) + SIZEOF(.@@manifest.name@@_BSS);
- .@@manifest.tfm_partition_name@@_STACK : ALIGN(128)
+ .@@manifest.name@@_STACK : ALIGN(128)
{
. += @@manifest.stack_size@@;
} > RAM AT> FLASH
- Image$$@@manifest.tfm_partition_name@@_STACK$$ZI$$Base = ADDR(.@@manifest.tfm_partition_name@@_STACK);
- Image$$@@manifest.tfm_partition_name@@_STACK$$ZI$$Limit = ADDR(.@@manifest.tfm_partition_name@@_STACK) + SIZEOF(.@@manifest.tfm_partition_name@@_STACK);
+ Image$$@@manifest.name@@_STACK$$ZI$$Base = ADDR(.@@manifest.name@@_STACK);
+ Image$$@@manifest.name@@_STACK$$ZI$$Limit = ADDR(.@@manifest.name@@_STACK) + SIZEOF(.@@manifest.name@@_STACK);
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#endif /* @@attr.conditional@@ */
diff --git a/platform/ext/target/musca_b1/Device/Source/gcc/musca_s.ld.template b/platform/ext/target/musca_b1/Device/Source/gcc/musca_s.ld.template
index 1a6b8bb..461862d 100644
--- a/platform/ext/target/musca_b1/Device/Source/gcc/musca_s.ld.template
+++ b/platform/ext/target/musca_b1/Device/Source/gcc/musca_s.ld.template
@@ -95,9 +95,9 @@
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#ifdef @@attr.conditional@@
@!GENERATOR_CONDITIONAL_END!@
- LONG (LOADADDR(.@@manifest.tfm_partition_name@@_DATA))
- LONG (ADDR(.@@manifest.tfm_partition_name@@_DATA))
- LONG (SIZEOF(.@@manifest.tfm_partition_name@@_DATA))
+ LONG (LOADADDR(.@@manifest.name@@_DATA))
+ LONG (ADDR(.@@manifest.name@@_DATA))
+ LONG (SIZEOF(.@@manifest.name@@_DATA))
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#endif /* @@attr.conditional@@ */
@!GENERATOR_CONDITIONAL_END!@
@@ -116,10 +116,10 @@
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#ifdef @@attr.conditional@@
@!GENERATOR_CONDITIONAL_END!@
- LONG (ADDR(.@@manifest.tfm_partition_name@@_BSS))
- LONG (SIZEOF(.@@manifest.tfm_partition_name@@_BSS))
- LONG (ADDR(.@@manifest.tfm_partition_name@@_STACK))
- LONG (SIZEOF(.@@manifest.tfm_partition_name@@_STACK))
+ LONG (ADDR(.@@manifest.name@@_BSS))
+ LONG (SIZEOF(.@@manifest.name@@_BSS))
+ LONG (ADDR(.@@manifest.name@@_STACK))
+ LONG (SIZEOF(.@@manifest.name@@_STACK))
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#endif /* @@attr.conditional@@ */
@!GENERATOR_CONDITIONAL_END!@
@@ -157,7 +157,7 @@
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#ifdef @@attr.conditional@@
@!GENERATOR_CONDITIONAL_END!@
- .@@manifest.tfm_partition_name@@ : ALIGN(32)
+ .@@manifest.name@@ : ALIGN(32)
{
@!GENERATOR_CONDITIONAL_START!@ @@manifest.tfm_linker_pattern.library_list@@
@@manifest.tfm_linker_pattern.library_list@@:*(.text*)
@@ -167,13 +167,13 @@
@@manifest.tfm_linker_pattern.object_list@@(.text*)
@@manifest.tfm_linker_pattern.object_list@@(.rodata*)
@!GENERATOR_CONDITIONAL_END!@
- *(@@manifest.tfm_partition_name@@_ATTR_FN)
+ *(@@manifest.name@@_ATTR_FN)
. = ALIGN(32);
} > FLASH
- Image$$@@manifest.tfm_partition_name@@$$RO$$Base = ADDR(.@@manifest.tfm_partition_name@@);
- Image$$@@manifest.tfm_partition_name@@$$RO$$Limit = ADDR(.@@manifest.tfm_partition_name@@) + SIZEOF(.@@manifest.tfm_partition_name@@);
- Image$$@@manifest.tfm_partition_name@@$$Base = ADDR(.@@manifest.tfm_partition_name@@);
- Image$$@@manifest.tfm_partition_name@@$$Limit = ADDR(.@@manifest.tfm_partition_name@@) + SIZEOF(.@@manifest.tfm_partition_name@@);
+ Image$$@@manifest.name@@$$RO$$Base = ADDR(.@@manifest.name@@);
+ Image$$@@manifest.name@@$$RO$$Limit = ADDR(.@@manifest.name@@) + SIZEOF(.@@manifest.name@@);
+ Image$$@@manifest.name@@$$Base = ADDR(.@@manifest.name@@);
+ Image$$@@manifest.name@@$$Limit = ADDR(.@@manifest.name@@) + SIZEOF(.@@manifest.name@@);
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#endif /* @@attr.conditional@@ */
@@ -312,7 +312,7 @@
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#ifdef @@attr.conditional@@
@!GENERATOR_CONDITIONAL_END!@
- .@@manifest.tfm_partition_name@@_DATA : ALIGN(32)
+ .@@manifest.name@@_DATA : ALIGN(32)
{
@!GENERATOR_CONDITIONAL_START!@ @@manifest.tfm_linker_pattern.library_list@@
@@manifest.tfm_linker_pattern.library_list@@:*(.data*)
@@ -322,10 +322,10 @@
@!GENERATOR_CONDITIONAL_END!@
. = ALIGN(32);
} > RAM AT> FLASH
- Image$$@@manifest.tfm_partition_name@@_DATA$$RW$$Base = ADDR(.@@manifest.tfm_partition_name@@_DATA);
- Image$$@@manifest.tfm_partition_name@@_DATA$$RW$$Limit = ADDR(.@@manifest.tfm_partition_name@@_DATA) + SIZEOF(.@@manifest.tfm_partition_name@@_DATA);
+ Image$$@@manifest.name@@_DATA$$RW$$Base = ADDR(.@@manifest.name@@_DATA);
+ Image$$@@manifest.name@@_DATA$$RW$$Limit = ADDR(.@@manifest.name@@_DATA) + SIZEOF(.@@manifest.name@@_DATA);
- .@@manifest.tfm_partition_name@@_BSS : ALIGN(32)
+ .@@manifest.name@@_BSS : ALIGN(32)
{
@!GENERATOR_CONDITIONAL_START!@ @@manifest.tfm_linker_pattern.library_list@@
@@manifest.tfm_linker_pattern.library_list@@:*(.bss*)
@@ -337,15 +337,15 @@
@!GENERATOR_CONDITIONAL_END!@
. = ALIGN(32);
} > RAM AT> FLASH
- Image$$@@manifest.tfm_partition_name@@_DATA$$ZI$$Base = ADDR(.@@manifest.tfm_partition_name@@_BSS);
- Image$$@@manifest.tfm_partition_name@@_DATA$$ZI$$Limit = ADDR(.@@manifest.tfm_partition_name@@_BSS) + SIZEOF(.@@manifest.tfm_partition_name@@_BSS);
+ Image$$@@manifest.name@@_DATA$$ZI$$Base = ADDR(.@@manifest.name@@_BSS);
+ Image$$@@manifest.name@@_DATA$$ZI$$Limit = ADDR(.@@manifest.name@@_BSS) + SIZEOF(.@@manifest.name@@_BSS);
- .@@manifest.tfm_partition_name@@_STACK : ALIGN(128)
+ .@@manifest.name@@_STACK : ALIGN(128)
{
. += @@manifest.stack_size@@;
} > RAM AT> FLASH
- Image$$@@manifest.tfm_partition_name@@_STACK$$ZI$$Base = ADDR(.@@manifest.tfm_partition_name@@_STACK);
- Image$$@@manifest.tfm_partition_name@@_STACK$$ZI$$Limit = ADDR(.@@manifest.tfm_partition_name@@_STACK) + SIZEOF(.@@manifest.tfm_partition_name@@_STACK);
+ Image$$@@manifest.name@@_STACK$$ZI$$Base = ADDR(.@@manifest.name@@_STACK);
+ Image$$@@manifest.name@@_STACK$$ZI$$Limit = ADDR(.@@manifest.name@@_STACK) + SIZEOF(.@@manifest.name@@_STACK);
@!GENERATOR_CONDITIONAL_START!@ @@attr.conditional@@
#endif /* @@attr.conditional@@ */
diff --git a/platform/include/tfm_plat_defs.h b/platform/include/tfm_plat_defs.h
index 66747ee..f0b4297 100644
--- a/platform/include/tfm_plat_defs.h
+++ b/platform/include/tfm_plat_defs.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017-2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2019, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -30,7 +30,7 @@
* secure partition at linker time in TF-M Level 3.
*
* \param[in] TFM_PARTITION_NAME TF-M partition name assigned in the manifest
- * file "tfm_partition_name" field.
+ * file "name" field.
*/
#define TFM_LINK_SET_OBJECT_IN_PARTITION_SECTION(TFM_PARTITION_NAME) \
__attribute__((section(TFM_PARTITION_NAME"_ATTR_FN")))