SST: Rename SST(Secure STorage) to PS(Protected Storage)
This patches renames SST(Secure STorage) to
PS(Protected Storage) for files, folders and any contents
in files to align with the PSA Storage API spec.
Change-Id: Icf991f59512875780c159f22737b521b3b2d4924
Signed-off-by: Kevin Peng <kevin.peng@arm.com>
diff --git a/platform/ext/common/armclang/tfm_common_s.sct b/platform/ext/common/armclang/tfm_common_s.sct
index c3777a6..c1f4084 100644
--- a/platform/ext/common/armclang/tfm_common_s.sct
+++ b/platform/ext/common/armclang/tfm_common_s.sct
@@ -110,12 +110,12 @@
}
#endif /* TFM_PARTITION_TEST_CORE_IPC */
-#ifdef TFM_PARTITION_TEST_SST
- TFM_SP_SST_TEST_LINKER +0 ALIGN 32 {
- *tfm_sst_test_service.* (+RO)
- *(TFM_SP_SST_TEST_ATTR_FN)
+#ifdef TFM_PARTITION_TEST_PS
+ TFM_SP_PS_TEST_LINKER +0 ALIGN 32 {
+ *tfm_ps_test_service.* (+RO)
+ *(TFM_SP_PS_TEST_ATTR_FN)
}
-#endif /* TFM_PARTITION_TEST_SST */
+#endif /* TFM_PARTITION_TEST_PS */
/*
* This empty, zero long execution region is here to mark the end address
@@ -132,13 +132,13 @@
TFM_APP_CODE_START +0 ALIGN 32 EMPTY 0x0 {
}
-#ifdef TFM_PARTITION_SECURE_STORAGE
- TFM_SP_STORAGE_LINKER +0 ALIGN 32 {
+#ifdef TFM_PARTITION_PROTECTED_STORAGE
+ TFM_SP_PS_LINKER +0 ALIGN 32 {
*tfm_storage* (+RO)
- *test_sst_nv_counters.* (+RO)
- *(TFM_SP_STORAGE_ATTR_FN)
+ *test_ps_nv_counters.* (+RO)
+ *(TFM_SP_PS_ATTR_FN)
}
-#endif /* TFM_PARTITION_SECURE_STORAGE */
+#endif /* TFM_PARTITION_PROTECTED_STORAGE */
#ifdef TFM_PARTITION_TEST_CORE
TFM_SP_CORE_TEST_2_LINKER +0 ALIGN 32 {
@@ -237,19 +237,19 @@
TFM_APP_RW_STACK_START +0 ALIGN 32 EMPTY 0x0 {
}
-#ifdef TFM_PARTITION_SECURE_STORAGE
- TFM_SP_STORAGE_LINKER_DATA +0 ALIGN 32 {
+#ifdef TFM_PARTITION_PROTECTED_STORAGE
+ TFM_SP_PS_LINKER_DATA +0 ALIGN 32 {
*tfm_storage* (+RW +ZI)
- *test_sst_nv_counters.* (+RW +ZI)
- *(TFM_SP_STORAGE_ATTR_RW)
- *(TFM_SP_STORAGE_ATTR_ZI)
+ *test_ps_nv_counters.* (+RW +ZI)
+ *(TFM_SP_PS_ATTR_RW)
+ *(TFM_SP_PS_ATTR_ZI)
}
#if defined (TFM_PSA_API)
- TFM_SP_STORAGE_LINKER_STACK +0 ALIGN 128 EMPTY 0x800 {
+ TFM_SP_PS_LINKER_STACK +0 ALIGN 128 EMPTY 0x800 {
}
#endif
-#endif /* TFM_PARTITION_SECURE_STORAGE */
+#endif /* TFM_PARTITION_PROTECTED_STORAGE */
#ifdef TFM_PARTITION_TEST_CORE
TFM_SP_CORE_TEST_2_LINKER_DATA +0 ALIGN 32 {
@@ -475,18 +475,18 @@
#endif
#endif /* TFM_PARTITION_TEST_CORE_IPC */
-#ifdef TFM_PARTITION_TEST_SST
- TFM_SP_SST_TEST_LINKER_DATA +0 ALIGN 32 {
- *tfm_sst_test_service.* (+RW +ZI)
- *(TFM_SP_SST_TEST_ATTR_RW)
- *(TFM_SP_SST_TEST_ATTR_ZI)
+#ifdef TFM_PARTITION_TEST_PS
+ TFM_SP_PS_TEST_LINKER_DATA +0 ALIGN 32 {
+ *tfm_ps_test_service.* (+RW +ZI)
+ *(TFM_SP_PS_TEST_ATTR_RW)
+ *(TFM_SP_PS_TEST_ATTR_ZI)
}
#if defined (TFM_PSA_API)
- TFM_SP_SST_TEST_LINKER_STACK +0 ALIGN 128 EMPTY 0x500 {
+ TFM_SP_PS_TEST_LINKER_STACK +0 ALIGN 128 EMPTY 0x500 {
}
#endif
-#endif /* TFM_PARTITION_TEST_SST */
+#endif /* TFM_PARTITION_TEST_PS */
/*
* This empty, zero long execution region is here to mark the end address
diff --git a/platform/ext/common/gcc/tfm_common_s.ld b/platform/ext/common/gcc/tfm_common_s.ld
index ef16828..c9ef4e2 100644
--- a/platform/ext/common/gcc/tfm_common_s.ld
+++ b/platform/ext/common/gcc/tfm_common_s.ld
@@ -67,11 +67,11 @@
LONG (ADDR(.TFM_UNPRIV_DATA))
LONG (SIZEOF(.TFM_UNPRIV_DATA))
#endif /* defined(TFM_PSA_API) */
-#ifdef TFM_PARTITION_SECURE_STORAGE
- LONG (LOADADDR(.TFM_SP_STORAGE_LINKER_DATA))
- LONG (ADDR(.TFM_SP_STORAGE_LINKER_DATA))
- LONG (SIZEOF(.TFM_SP_STORAGE_LINKER_DATA))
-#endif /* TFM_PARTITION_SECURE_STORAGE */
+#ifdef TFM_PARTITION_PROTECTED_STORAGE
+ LONG (LOADADDR(.TFM_SP_PS_LINKER_DATA))
+ LONG (ADDR(.TFM_SP_PS_LINKER_DATA))
+ LONG (SIZEOF(.TFM_SP_PS_LINKER_DATA))
+#endif /* TFM_PARTITION_PROTECTED_STORAGE */
#ifdef TFM_PARTITION_INTERNAL_TRUSTED_STORAGE
LONG (LOADADDR(.TFM_SP_ITS_LINKER_DATA))
LONG (ADDR(.TFM_SP_ITS_LINKER_DATA))
@@ -127,11 +127,11 @@
LONG (ADDR(.TFM_IRQ_TEST_1_LINKER_DATA))
LONG (SIZEOF(.TFM_IRQ_TEST_1_LINKER_DATA))
#endif /* TFM_ENABLE_IRQ_TEST */
-#ifdef TFM_PARTITION_TEST_SST
- LONG (LOADADDR(.TFM_SP_SST_TEST_LINKER_DATA))
- LONG (ADDR(.TFM_SP_SST_TEST_LINKER_DATA))
- LONG (SIZEOF(.TFM_SP_SST_TEST_LINKER_DATA))
-#endif /* TFM_PARTITION_TEST_SST */
+#ifdef TFM_PARTITION_TEST_PS
+ LONG (LOADADDR(.TFM_SP_PS_TEST_LINKER_DATA))
+ LONG (ADDR(.TFM_SP_PS_TEST_LINKER_DATA))
+ LONG (SIZEOF(.TFM_SP_PS_TEST_LINKER_DATA))
+#endif /* TFM_PARTITION_TEST_PS */
#ifdef TFM_PARTITION_TEST_SECURE_SERVICES
LONG (LOADADDR(.TFM_SP_SECURE_CLIENT_2_LINKER_DATA))
LONG (ADDR(.TFM_SP_SECURE_CLIENT_2_LINKER_DATA))
@@ -164,14 +164,14 @@
LONG (ADDR(.TFM_SECURE_STACK))
LONG (SIZEOF(.TFM_SECURE_STACK))
#endif /* !defined(TFM_PSA_API) */
-#ifdef TFM_PARTITION_SECURE_STORAGE
- LONG (ADDR(.TFM_SP_STORAGE_LINKER_BSS))
- LONG (SIZEOF(.TFM_SP_STORAGE_LINKER_BSS))
+#ifdef TFM_PARTITION_PROTECTED_STORAGE
+ LONG (ADDR(.TFM_SP_PS_LINKER_BSS))
+ LONG (SIZEOF(.TFM_SP_PS_LINKER_BSS))
#if defined(TFM_PSA_API)
- LONG (ADDR(.TFM_SP_STORAGE_LINKER_STACK))
- LONG (SIZEOF(.TFM_SP_STORAGE_LINKER_STACK))
+ LONG (ADDR(.TFM_SP_PS_LINKER_STACK))
+ LONG (SIZEOF(.TFM_SP_PS_LINKER_STACK))
#endif
-#endif /* TFM_PARTITION_SECURE_STORAGE */
+#endif /* TFM_PARTITION_PROTECTED_STORAGE */
#ifdef TFM_PARTITION_INTERNAL_TRUSTED_STORAGE
LONG (ADDR(.TFM_SP_ITS_LINKER_BSS))
LONG (SIZEOF(.TFM_SP_ITS_LINKER_BSS))
@@ -260,14 +260,14 @@
LONG (SIZEOF(.TFM_IRQ_TEST_1_LINKER_STACK))
#endif
#endif /* TFM_ENABLE_IRQ_TEST */
-#ifdef TFM_PARTITION_TEST_SST
- LONG (ADDR(.TFM_SP_SST_TEST_LINKER_BSS))
- LONG (SIZEOF(.TFM_SP_SST_TEST_LINKER_BSS))
+#ifdef TFM_PARTITION_TEST_PS
+ LONG (ADDR(.TFM_SP_PS_TEST_LINKER_BSS))
+ LONG (SIZEOF(.TFM_SP_PS_TEST_LINKER_BSS))
#if defined(TFM_PSA_API)
- LONG (ADDR(.TFM_SP_SST_TEST_LINKER_STACK))
- LONG (SIZEOF(.TFM_SP_SST_TEST_LINKER_STACK))
+ LONG (ADDR(.TFM_SP_PS_TEST_LINKER_STACK))
+ LONG (SIZEOF(.TFM_SP_PS_TEST_LINKER_STACK))
#endif
-#endif /* TFM_PARTITION_TEST_SST */
+#endif /* TFM_PARTITION_TEST_PS */
#ifdef TFM_PARTITION_TEST_SECURE_SERVICES
LONG (ADDR(.TFM_SP_SECURE_CLIENT_2_LINKER_BSS))
LONG (SIZEOF(.TFM_SP_SECURE_CLIENT_2_LINKER_BSS))
@@ -446,19 +446,19 @@
Image$$TFM_SP_IPC_SERVICE_TEST_LINKER$$Limit = ADDR(.TFM_SP_IPC_SERVICE_TEST_LINKER) + SIZEOF(.TFM_SP_IPC_SERVICE_TEST_LINKER);
#endif /* TFM_PARTITION_TEST_CORE_IPC */
-#ifdef TFM_PARTITION_TEST_SST
- .TFM_SP_SST_TEST_LINKER : ALIGN(32)
+#ifdef TFM_PARTITION_TEST_PS
+ .TFM_SP_PS_TEST_LINKER : ALIGN(32)
{
- *tfm_sst_test_service.*(.text*)
- *tfm_sst_test_service.*(.rodata*)
- *(TFM_SP_SST_TEST_ATTR_FN)
+ *tfm_ps_test_service.*(.text*)
+ *tfm_ps_test_service.*(.rodata*)
+ *(TFM_SP_PS_TEST_ATTR_FN)
. = ALIGN(32);
} > FLASH
- Image$$TFM_SP_SST_TEST_LINKER$$RO$$Base = ADDR(.TFM_SP_SST_TEST_LINKER);
- Image$$TFM_SP_SST_TEST_LINKER$$RO$$Limit = ADDR(.TFM_SP_SST_TEST_LINKER) + SIZEOF(.TFM_SP_SST_TEST_LINKER);
- Image$$TFM_SP_SST_TEST_LINKER$$Base = ADDR(.TFM_SP_SST_TEST_LINKER);
- Image$$TFM_SP_SST_TEST_LINKER$$Limit = ADDR(.TFM_SP_SST_TEST_LINKER) + SIZEOF(.TFM_SP_SST_TEST_LINKER);
-#endif /* TFM_PARTITION_TEST_SST */
+ Image$$TFM_SP_PS_TEST_LINKER$$RO$$Base = ADDR(.TFM_SP_PS_TEST_LINKER);
+ Image$$TFM_SP_PS_TEST_LINKER$$RO$$Limit = ADDR(.TFM_SP_PS_TEST_LINKER) + SIZEOF(.TFM_SP_PS_TEST_LINKER);
+ Image$$TFM_SP_PS_TEST_LINKER$$Base = ADDR(.TFM_SP_PS_TEST_LINKER);
+ Image$$TFM_SP_PS_TEST_LINKER$$Limit = ADDR(.TFM_SP_PS_TEST_LINKER) + SIZEOF(.TFM_SP_PS_TEST_LINKER);
+#endif /* TFM_PARTITION_TEST_PS */
/**** PSA RoT RO part (CODE + RODATA) end here */
Image$$TFM_PSA_CODE_END$$Base = .;
@@ -466,21 +466,21 @@
/**** APPLICATION RoT RO part (CODE + RODATA) start here */
Image$$TFM_APP_CODE_START$$Base = .;
-#ifdef TFM_PARTITION_SECURE_STORAGE
- .TFM_SP_STORAGE_LINKER : ALIGN(32)
+#ifdef TFM_PARTITION_PROTECTED_STORAGE
+ .TFM_SP_PS_LINKER : ALIGN(32)
{
*tfm_storage*:*(.text*)
*tfm_storage*:*(.rodata*)
- *test_sst_nv_counters.*(.text*)
- *test_sst_nv_counters.*(.rodata*)
- *(TFM_SP_STORAGE_ATTR_FN)
+ *test_ps_nv_counters.*(.text*)
+ *test_ps_nv_counters.*(.rodata*)
+ *(TFM_SP_PS_ATTR_FN)
. = ALIGN(32);
} > FLASH
- Image$$TFM_SP_STORAGE_LINKER$$RO$$Base = ADDR(.TFM_SP_STORAGE_LINKER);
- Image$$TFM_SP_STORAGE_LINKER$$RO$$Limit = ADDR(.TFM_SP_STORAGE_LINKER) + SIZEOF(.TFM_SP_STORAGE_LINKER);
- Image$$TFM_SP_STORAGE_LINKER$$Base = ADDR(.TFM_SP_STORAGE_LINKER);
- Image$$TFM_SP_STORAGE_LINKER$$Limit = ADDR(.TFM_SP_STORAGE_LINKER) + SIZEOF(.TFM_SP_STORAGE_LINKER);
-#endif /* TFM_PARTITION_SECURE_STORAGE */
+ Image$$TFM_SP_PS_LINKER$$RO$$Base = ADDR(.TFM_SP_PS_LINKER);
+ Image$$TFM_SP_PS_LINKER$$RO$$Limit = ADDR(.TFM_SP_PS_LINKER) + SIZEOF(.TFM_SP_PS_LINKER);
+ Image$$TFM_SP_PS_LINKER$$Base = ADDR(.TFM_SP_PS_LINKER);
+ Image$$TFM_SP_PS_LINKER$$Limit = ADDR(.TFM_SP_PS_LINKER) + SIZEOF(.TFM_SP_PS_LINKER);
+#endif /* TFM_PARTITION_PROTECTED_STORAGE */
#ifdef TFM_PARTITION_TEST_CORE
.TFM_SP_CORE_TEST_2_LINKER : ALIGN(32)
@@ -697,41 +697,41 @@
/**** APPLICATION RoT DATA start here */
Image$$TFM_APP_RW_STACK_START$$Base = .;
-#ifdef TFM_PARTITION_SECURE_STORAGE
- .TFM_SP_STORAGE_LINKER_DATA : ALIGN(32)
+#ifdef TFM_PARTITION_PROTECTED_STORAGE
+ .TFM_SP_PS_LINKER_DATA : ALIGN(32)
{
*tfm_storage*:*(.data*)
- *test_sst_nv_counters.*(.data*)
- *(TFM_SP_STORAGE_ATTR_RW)
+ *test_ps_nv_counters.*(.data*)
+ *(TFM_SP_PS_ATTR_RW)
. = ALIGN(32);
} > RAM AT> FLASH
- Image$$TFM_SP_STORAGE_LINKER_DATA$$RW$$Base = ADDR(.TFM_SP_STORAGE_LINKER_DATA);
- Image$$TFM_SP_STORAGE_LINKER_DATA$$RW$$Limit = ADDR(.TFM_SP_STORAGE_LINKER_DATA) + SIZEOF(.TFM_SP_STORAGE_LINKER_DATA);
+ Image$$TFM_SP_PS_LINKER_DATA$$RW$$Base = ADDR(.TFM_SP_PS_LINKER_DATA);
+ Image$$TFM_SP_PS_LINKER_DATA$$RW$$Limit = ADDR(.TFM_SP_PS_LINKER_DATA) + SIZEOF(.TFM_SP_PS_LINKER_DATA);
- .TFM_SP_STORAGE_LINKER_BSS : ALIGN(32)
+ .TFM_SP_PS_LINKER_BSS : ALIGN(32)
{
- start_of_TFM_SP_STORAGE_LINKER = .;
+ start_of_TFM_SP_PS_LINKER = .;
*tfm_storage*:*(.bss*)
*tfm_storage*:*(COMMON)
- *test_sst_nv_counters.*(.bss*)
- *test_sst_nv_counters.*(COMMON)
- *(TFM_SP_STORAGE_ATTR_ZI)
- . += (. - start_of_TFM_SP_STORAGE_LINKER) ? 0 : 4;
+ *test_ps_nv_counters.*(.bss*)
+ *test_ps_nv_counters.*(COMMON)
+ *(TFM_SP_PS_ATTR_ZI)
+ . += (. - start_of_TFM_SP_PS_LINKER) ? 0 : 4;
. = ALIGN(32);
} > RAM AT> RAM
- Image$$TFM_SP_STORAGE_LINKER_DATA$$ZI$$Base = ADDR(.TFM_SP_STORAGE_LINKER_BSS);
- Image$$TFM_SP_STORAGE_LINKER_DATA$$ZI$$Limit = ADDR(.TFM_SP_STORAGE_LINKER_BSS) + SIZEOF(.TFM_SP_STORAGE_LINKER_BSS);
+ Image$$TFM_SP_PS_LINKER_DATA$$ZI$$Base = ADDR(.TFM_SP_PS_LINKER_BSS);
+ Image$$TFM_SP_PS_LINKER_DATA$$ZI$$Limit = ADDR(.TFM_SP_PS_LINKER_BSS) + SIZEOF(.TFM_SP_PS_LINKER_BSS);
#if defined (TFM_PSA_API)
- .TFM_SP_STORAGE_LINKER_STACK : ALIGN(128)
+ .TFM_SP_PS_LINKER_STACK : ALIGN(128)
{
. += 0x800;
} > RAM
- Image$$TFM_SP_STORAGE_LINKER_STACK$$ZI$$Base = ADDR(.TFM_SP_STORAGE_LINKER_STACK);
- Image$$TFM_SP_STORAGE_LINKER_STACK$$ZI$$Limit = ADDR(.TFM_SP_STORAGE_LINKER_STACK) + SIZEOF(.TFM_SP_STORAGE_LINKER_STACK);
+ Image$$TFM_SP_PS_LINKER_STACK$$ZI$$Base = ADDR(.TFM_SP_PS_LINKER_STACK);
+ Image$$TFM_SP_PS_LINKER_STACK$$ZI$$Limit = ADDR(.TFM_SP_PS_LINKER_STACK) + SIZEOF(.TFM_SP_PS_LINKER_STACK);
#endif
-#endif /* TFM_PARTITION_SECURE_STORAGE */
+#endif /* TFM_PARTITION_PROTECTED_STORAGE */
#ifdef TFM_PARTITION_TEST_CORE
.TFM_SP_CORE_TEST_2_LINKER_DATA : ALIGN(32)
@@ -1269,38 +1269,38 @@
#endif /* TFM_PARTITION_TEST_CORE_IPC */
-#ifdef TFM_PARTITION_TEST_SST
- .TFM_SP_SST_TEST_LINKER_DATA : ALIGN(32)
+#ifdef TFM_PARTITION_TEST_PS
+ .TFM_SP_PS_TEST_LINKER_DATA : ALIGN(32)
{
- *tfm_sst_test_service.*(.data*)
- *(TFM_SP_SST_TEST_ATTR_RW)
+ *tfm_ps_test_service.*(.data*)
+ *(TFM_SP_PS_TEST_ATTR_RW)
. = ALIGN(32);
} > RAM AT> FLASH
- Image$$TFM_SP_SST_TEST_LINKER_DATA$$RW$$Base = ADDR(.TFM_SP_SST_TEST_LINKER_DATA);
- Image$$TFM_SP_SST_TEST_LINKER_DATA$$RW$$Limit = ADDR(.TFM_SP_SST_TEST_LINKER_DATA) + SIZEOF(.TFM_SP_SST_TEST_LINKER_DATA);
+ Image$$TFM_SP_PS_TEST_LINKER_DATA$$RW$$Base = ADDR(.TFM_SP_PS_TEST_LINKER_DATA);
+ Image$$TFM_SP_PS_TEST_LINKER_DATA$$RW$$Limit = ADDR(.TFM_SP_PS_TEST_LINKER_DATA) + SIZEOF(.TFM_SP_PS_TEST_LINKER_DATA);
- .TFM_SP_SST_TEST_LINKER_BSS : ALIGN(32)
+ .TFM_SP_PS_TEST_LINKER_BSS : ALIGN(32)
{
- start_of_TFM_SP_SST_TEST_LINKER = .;
- *tfm_sst_test_service.*(.bss*)
- *tfm_sst_test_service.*(COMMON)
- *(TFM_SP_SST_TEST_ATTR_ZI)
- . += (. - start_of_TFM_SP_SST_TEST_LINKER) ? 0 : 4;
+ start_of_TFM_SP_PS_TEST_LINKER = .;
+ *tfm_ps_test_service.*(.bss*)
+ *tfm_ps_test_service.*(COMMON)
+ *(TFM_SP_PS_TEST_ATTR_ZI)
+ . += (. - start_of_TFM_SP_PS_TEST_LINKER) ? 0 : 4;
. = ALIGN(32);
} > RAM AT> RAM
- Image$$TFM_SP_SST_TEST_LINKER_DATA$$ZI$$Base = ADDR(.TFM_SP_SST_TEST_LINKER_BSS);
- Image$$TFM_SP_SST_TEST_LINKER_DATA$$ZI$$Limit = ADDR(.TFM_SP_SST_TEST_LINKER_BSS) + SIZEOF(.TFM_SP_SST_TEST_LINKER_BSS);
+ Image$$TFM_SP_PS_TEST_LINKER_DATA$$ZI$$Base = ADDR(.TFM_SP_PS_TEST_LINKER_BSS);
+ Image$$TFM_SP_PS_TEST_LINKER_DATA$$ZI$$Limit = ADDR(.TFM_SP_PS_TEST_LINKER_BSS) + SIZEOF(.TFM_SP_PS_TEST_LINKER_BSS);
#if defined (TFM_PSA_API)
- .TFM_SP_SST_TEST_LINKER_STACK : ALIGN(128)
+ .TFM_SP_PS_TEST_LINKER_STACK : ALIGN(128)
{
. += 0x500;
} > RAM
- Image$$TFM_SP_SST_TEST_LINKER_STACK$$ZI$$Base = ADDR(.TFM_SP_SST_TEST_LINKER_STACK);
- Image$$TFM_SP_SST_TEST_LINKER_STACK$$ZI$$Limit = ADDR(.TFM_SP_SST_TEST_LINKER_STACK) + SIZEOF(.TFM_SP_SST_TEST_LINKER_STACK);
+ Image$$TFM_SP_PS_TEST_LINKER_STACK$$ZI$$Base = ADDR(.TFM_SP_PS_TEST_LINKER_STACK);
+ Image$$TFM_SP_PS_TEST_LINKER_STACK$$ZI$$Limit = ADDR(.TFM_SP_PS_TEST_LINKER_STACK) + SIZEOF(.TFM_SP_PS_TEST_LINKER_STACK);
#endif
-#endif /* TFM_PARTITION_TEST_SST */
+#endif /* TFM_PARTITION_TEST_PS */
/**** PSA RoT DATA end here */
Image$$TFM_PSA_RW_STACK_END$$Base = .;
diff --git a/platform/ext/common/iar/tfm_common_s.icf b/platform/ext/common/iar/tfm_common_s.icf
index 04d5ebb..9996da8 100644
--- a/platform/ext/common/iar/tfm_common_s.icf
+++ b/platform/ext/common/iar/tfm_common_s.icf
@@ -110,12 +110,12 @@
};
#endif /* TFM_PARTITION_TEST_CORE_IPC */
-#ifdef TFM_PARTITION_TEST_SST
-define block TFM_SP_SST_TEST_LINKER with alignment = 32 {
- ro object *tfm_sst_test_service.*,
- section TFM_SP_SST_TEST_ATTR_FN
+#ifdef TFM_PARTITION_TEST_PS
+define block TFM_SP_PS_TEST_LINKER with alignment = 32 {
+ ro object *tfm_ps_test_service.*,
+ section TFM_SP_PS_TEST_ATTR_FN
};
-#endif /* TFM_PARTITION_TEST_SST */
+#endif /* TFM_PARTITION_TEST_PS */
/*
* This empty, zero long execution region is here to mark the end address
@@ -130,12 +130,12 @@
*/
define block TFM_APP_CODE_START with alignment = 32, size = 0 { };
-#ifdef TFM_PARTITION_SECURE_STORAGE
-define block TFM_SP_STORAGE_LINKER with alignment = 32 {
+#ifdef TFM_PARTITION_PROTECTED_STORAGE
+define block TFM_SP_PS_LINKER with alignment = 32 {
ro object *tfm_storage*,
- ro object *test_sst_nv_counters.*,
+ ro object *test_ps_nv_counters.*,
};
-#endif /* TFM_PARTITION_SECURE_STORAGE */
+#endif /* TFM_PARTITION_PROTECTED_STORAGE */
#ifdef TFM_PARTITION_TEST_CORE
define block TFM_SP_CORE_TEST_2_LINKER with alignment = 32 {
@@ -199,16 +199,16 @@
define block TFM_APP_RW_STACK_START with alignment = 32, size = 0 { };
-#ifdef TFM_PARTITION_SECURE_STORAGE
-define block TFM_SP_STORAGE_LINKER_DATA with alignment = 32 {
+#ifdef TFM_PARTITION_PROTECTED_STORAGE
+define block TFM_SP_PS_LINKER_DATA with alignment = 32 {
rw object *tfm_storage*,
- rw object *test_sst_nv_counters.*,
+ rw object *test_ps_nv_counters.*,
};
#if defined (TFM_PSA_API)
-define block TFM_SP_STORAGE_LINKER_STACK with alignment = 128, size = 0x800 { };
+define block TFM_SP_PS_LINKER_STACK with alignment = 128, size = 0x800 { };
#endif
-#endif /* TFM_PARTITION_SECURE_STORAGE */
+#endif /* TFM_PARTITION_PROTECTED_STORAGE */
#ifdef TFM_PARTITION_TEST_CORE
define block TFM_SP_CORE_TEST_2_LINKER_DATA with alignment = 32 {
@@ -393,15 +393,15 @@
#endif
#endif /* TFM_PARTITION_TEST_CORE_IPC */
-#ifdef TFM_PARTITION_TEST_SST
-define block TFM_SP_SST_TEST_LINKER_DATA with alignment = 32 {
- rw object *tfm_sst_test_service.*,
+#ifdef TFM_PARTITION_TEST_PS
+define block TFM_SP_PS_TEST_LINKER_DATA with alignment = 32 {
+ rw object *tfm_ps_test_service.*,
};
#if defined (TFM_PSA_API)
-define block TFM_SP_SST_TEST_LINKER_STACK with alignment = 128, size = 0x500 { };
+define block TFM_SP_PS_TEST_LINKER_STACK with alignment = 128, size = 0x500 { };
#endif
-#endif /* TFM_PARTITION_TEST_SST */
+#endif /* TFM_PARTITION_TEST_PS */
/*
@@ -444,9 +444,9 @@
#ifdef TFM_PARTITION_TEST_CORE_IPC
block TFM_SP_IPC_SERVICE_TEST_LINKER,
#endif /* TFM_PARTITION_TEST_CORE_IPC */
-#ifdef TFM_PARTITION_TEST_SST
- block TFM_SP_SST_TEST_LINKER,
-#endif /* TFM_PARTITION_TEST_SST */
+#ifdef TFM_PARTITION_TEST_PS
+ block TFM_SP_PS_TEST_LINKER,
+#endif /* TFM_PARTITION_TEST_PS */
block TFM_PSA_CODE_END,
@@ -456,9 +456,9 @@
* of APP RoT code.
*/
block TFM_APP_CODE_START,
-#ifdef TFM_PARTITION_SECURE_STORAGE
- block TFM_SP_STORAGE_LINKER,
-#endif /* TFM_PARTITION_SECURE_STORAGE */
+#ifdef TFM_PARTITION_PROTECTED_STORAGE
+ block TFM_SP_PS_LINKER,
+#endif /* TFM_PARTITION_PROTECTED_STORAGE */
#ifdef TFM_PARTITION_TEST_CORE
block TFM_SP_CORE_TEST_2_LINKER,
@@ -532,13 +532,13 @@
*/
block TFM_APP_RW_STACK_START,
-#ifdef TFM_PARTITION_SECURE_STORAGE
- block TFM_SP_STORAGE_LINKER_DATA,
+#ifdef TFM_PARTITION_PROTECTED_STORAGE
+ block TFM_SP_PS_LINKER_DATA,
#if defined (TFM_PSA_API)
- block TFM_SP_STORAGE_LINKER_STACK,
+ block TFM_SP_PS_LINKER_STACK,
#endif
-#endif /* TFM_PARTITION_SECURE_STORAGE */
+#endif /* TFM_PARTITION_PROTECTED_STORAGE */
#ifdef TFM_PARTITION_TEST_CORE
block TFM_SP_CORE_TEST_2_LINKER_DATA,
@@ -677,13 +677,13 @@
#endif
#endif /* TFM_PARTITION_TEST_CORE_IPC */
-#ifdef TFM_PARTITION_TEST_SST
- block TFM_SP_SST_TEST_LINKER_DATA,
+#ifdef TFM_PARTITION_TEST_PS
+ block TFM_SP_PS_TEST_LINKER_DATA,
#if defined (TFM_PSA_API)
- block TFM_SP_SST_TEST_LINKER_STACK,
+ block TFM_SP_PS_TEST_LINKER_STACK,
#endif
-#endif /* TFM_PARTITION_TEST_SST */
+#endif /* TFM_PARTITION_TEST_PS */
/*
* This empty, zero long execution region is here to mark the end address
diff --git a/platform/ext/common/template/nv_counters.c b/platform/ext/common/template/nv_counters.c
index f1fb28c..5149d0e 100644
--- a/platform/ext/common/template/nv_counters.c
+++ b/platform/ext/common/template/nv_counters.c
@@ -6,8 +6,8 @@
*/
/* NOTE: This API should be implemented by platform vendor. For the security of
- * the secure storage system's and the bootloader's rollback protection etc. it
- * is CRITICAL to use a internal (in-die) persistent memory for multiple time
+ * the protected storage system's and the bootloader's rollback protection etc.
+ * it is CRITICAL to use a internal (in-die) persistent memory for multiple time
* programmable (MTP) non-volatile counters or use a One-time Programmable (OTP)
* non-volatile counters solution.
*